Changeset 10017 in vbox

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

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuestLib/VBoxGuestR3LibInfoSvc.cpp (modified) (1 diff)
• HostServices/SharedInfoServices/service.cpp (modified) (7 diffs)

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;

trunk/src/VBox/HostServices/SharedInfoServices/service.cpp

@@ -238 +238 @@
 /**
  * Retrieve a value from the guest registry by key, checking the validity
- * of the arguments passed.
+ * of the arguments passed.  If the guest has not allocated enough buffer
+ * space for the value then we return VERR_OVERFLOW and set the size of the
+ * buffer needed in the "size" HGCM parameter.  If the key was not found at
+ * all, we return VERR_NOT_FOUND.
  *
  * @returns iprt status value
@@ -269 +272 @@
         VBoxHGCMParmUInt32Set(&paParms[2], cbValueActual);
     if (RT_SUCCESS(rc) && (cbValueActual > cbValue))
-        rc = VINF_BUFFER_OVERFLOW;
+        rc = VERR_BUFFER_OVERFLOW;
     if (RT_SUCCESS(rc) && (rc != VINF_BUFFER_OVERFLOW))
         rc = CFGMR3QueryString(mpNode, pszKey, pszValue, cbValue);
@@ -275 +278 @@
         Log2(("Queried string %s, rc=%Rrc, value=%.*s\n", pszKey, rc, cbValue, pszValue));
     else if (VERR_CFGM_VALUE_NOT_FOUND == rc)
-    {
-        VBoxHGCMParmUInt32Set(&paParms[2], 0);
-        rc = VINF_SUCCESS;
-    }
+        rc = VERR_NOT_FOUND;
     LogFlowThisFunc(("rc = %Rrc\n", rc));
     return rc;
@@ -396 +396 @@
         case SET_CONFIG_KEY:
             LogFlowFunc(("SET_CONFIG_KEY\n"));
-            if (RT_SUCCESS(rc))
-                rc = setKey(cParms, paParms);
+            rc = setKey(cParms, paParms);
             break;
 
@@ -403 +402 @@
         case DEL_CONFIG_KEY:
             LogFlowFunc(("DEL_CONFIG_KEY\n"));
-            if (RT_SUCCESS(rc))
-                rc = delKey(cParms, paParms);
+            rc = delKey(cParms, paParms);
             break;
 
@@ -466 +464 @@
         case SET_CONFIG_KEY_HOST:
             LogFlowFunc(("SET_CONFIG_KEY_HOST\n"));
-            if (RT_SUCCESS(rc))
-                rc = setKey(cParms, paParms);
+            rc = setKey(cParms, paParms);
             break;
 
@@ -473 +470 @@
         case DEL_CONFIG_KEY_HOST:
             LogFlowFunc(("DEL_CONFIG_KEY_HOST\n"));
-            if (RT_SUCCESS(rc))
-                rc = delKey(cParms, paParms);
+            rc = delKey(cParms, paParms);
             break;