Changeset 10017 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jun 30, 2008 2:06:54 PM (17 years ago)

Author:

vboxsync

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

32491

Message:

HostServices/SharedInfoService and Additions/common: deal with overflow and missing keys better when querying guest properties

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibInfoSvc.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibInfoSvc.cpp

@@ -154 +154 @@
         rc = Msg.hdr.result;
     uint32_t cbActual;
-    if (RT_SUCCESS(rc))
-        rc = VbglHGCMParmUInt32Get(&Msg.size, &cbActual);
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc) || (VERR_BUFFER_OVERFLOW == rc))
     {
-        if (pcbActual != NULL)
-            *pcbActual = cbActual;
-        if (cbActual > cbValue)
-            rc = VINF_BUFFER_OVERFLOW;
+        int rc2 = VbglHGCMParmUInt32Get(&Msg.size, &cbActual);
+        if (RT_SUCCESS(rc2))
+        {
+            if (pcbActual != NULL)
+                *pcbActual = cbActual;
+        }
         else
-            rc = Msg.hdr.result;
-        if ((cbValue > 0) && (0 == cbActual))  /* No such property */
-            pszValue[0] = 0;
+            rc = rc2;
     }
     return rc;