Changeset 5611 in vbox

Timestamp:

Nov 2, 2007 11:40:44 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

25903

Message:

Fixed querying netAddress property in VRDP server.

File:

• trunk/src/VBox/Main/ConsoleVRDPServer.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -644 +644 @@
         case VRDP_QP_NETWORK_ADDRESS:
         {
-            com::Bstr address;
-            server->mConsole->getVRDPServer ()->COMGETTER(NetAddress) (address.asOutParam());
-
-            if (cbBuffer >= address.length ())
-            {
-                if (address.length () > 0)
+            com::Bstr bstr;
+            server->mConsole->getVRDPServer ()->COMGETTER(NetAddress) (bstr.asOutParam());
+            
+            /* The server expects UTF8. */
+            com::Utf8Str address = bstr;
+
+            size_t cbAddress = address.length () + 1;
+            
+            if (cbAddress >= 0x10000)
+            {
+                /* More than 64K seems to be an  invalid address. */
+                rc = VERR_TOO_MUCH_DATA;
+                break;
+            }
+            
+            if ((size_t)cbBuffer >= cbAddress)
+            {
+                if (cbAddress > 0)
                 {
-                   memcpy (pvBuffer, address.raw(), address.length ());
+                    memcpy (pvBuffer, address.raw(), cbAddress);
                 }
+
                 rc = VINF_SUCCESS;
             }
-
-            *pcbOut = address.length ();
+            else
+            {
+                rc = VINF_BUFFER_OVERFLOW;
+            }
+
+            *pcbOut = (uint32_t)cbAddress;
         } break;