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

Timestamp:

Jul 23, 2008 1:06:20 PM (17 years ago)

Author:

vboxsync

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

33614

Message:

Additions/common: small adjustment in guest property reading code

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxControl/VBoxControl.cpp (modified) (2 diffs)
• VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -884 +884 @@
     int rc = VINF_SUCCESS;
 
-    /* We leave a bit of space here in case the maximum values are raised. */
-    uint32_t cbBuf = MAX_VALUE_LEN + MAX_FLAGS_LEN + 1024;
-    void *pvBuf = RTMemAlloc(cbBuf);
-    if (NULL == pvBuf)
-    {
-        rc = VERR_NO_MEMORY;
-        VBoxControlError("Out of memory\n");
-    }
-    if (RT_SUCCESS(rc))
-    {
-        rc = VbglR3GuestPropConnect(&u32ClientId);
-        if (!RT_SUCCESS(rc))
-            VBoxControlError("Failed to connect to the guest property service, error %Rrc\n", rc);
-    }
+    rc = VbglR3GuestPropConnect(&u32ClientId);
+    if (!RT_SUCCESS(rc))
+        VBoxControlError("Failed to connect to the guest property service, error %Rrc\n", rc);
 
 /*
@@ -913 +902 @@
          * enough with buffer space. */
         bool finish = false;
-        for (int i = 0; (i < 10) && !finish; ++i)
-        {
-            rc = VbglR3GuestPropRead(u32ClientId, pszName, pvBuf, cbBuf,
-                                     &pszValue, &u64Timestamp, &pszFlags,
-                                     &cbBuf);
+        /* We leave a bit of space here in case the maximum values are raised. */
+        void *pvBuf = NULL;
+        uint32_t cbBuf = MAX_VALUE_LEN + MAX_FLAGS_LEN + 1024;
+        for (unsigned i = 0; (i < 10) && !finish; ++i)
+        {
+            pvBuf = RTMemRealloc(pvBuf, cbBuf);
+            if (NULL == pvBuf)
+            {
+                rc = VERR_NO_MEMORY;
+                VBoxControlError("Out of memory\n");
+            }
+            else
+                rc = VbglR3GuestPropRead(u32ClientId, pszName, pvBuf, cbBuf,
+                                         &pszValue, &u64Timestamp, &pszFlags,
+                                         &cbBuf);
             if (VERR_BUFFER_OVERFLOW == rc)
-            {
-                pvBuf = RTMemRealloc(pvBuf, cbBuf);
-                if (NULL == pvBuf)
-                    rc = VERR_NO_MEMORY;
-            }
-            if (rc != VERR_BUFFER_OVERFLOW)
+                /* Leave a bit of extra space to be safe */
+                cbBuf += 1024;
+            else
                 finish = true;
         }

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

@@ -258 +258 @@
 {
     int rc = VINF_SUCCESS;
-    uint32_t cchBuf = 1024;
-    void *pvBuf = RTMemAlloc(cchBuf);
     char *pszValue = NULL;
     *ppszValue = NULL;
-    if (NULL == pvBuf)
-        rc = VERR_NO_MEMORY;
-    if (RT_SUCCESS(rc))
-    {
-        /* There is a race here between our reading the property size and the
-         * host changing the value before we read it.  Try up to ten times and
-         * report the problem if that fails. */
-        bool finish = false;
-        for (unsigned i = 0; (i < 10) && !finish; ++i)
-        {
+
+    /* There is a race here between our reading the property size and the
+     * host changing the value before we read it.  Try up to ten times and
+     * report the problem if that fails. */
+    bool finish = false;
+    /* We leave a bit of space here in case the maximum value is raised. */
+    uint32_t cchBuf = MAX_VALUE_LEN + 1024;
+    void *pvBuf = NULL;
+    for (unsigned i = 0; (i < 10) && !finish; ++i)
+    {
+        pvBuf = RTMemRealloc(pvBuf, cchBuf);
+        if (NULL == pvBuf)
+            rc = VERR_NO_MEMORY;
+        else
             rc = VbglR3GuestPropRead(u32ClientId, pszName, pvBuf, cchBuf,
                                      &pszValue, NULL, NULL, &cchBuf);
-            if (VERR_BUFFER_OVERFLOW == rc)
-            {
-                pvBuf = RTMemRealloc(pvBuf, cchBuf);
-                if (NULL == pvBuf)
-                    rc = VERR_NO_MEMORY;
-            }
-            if (rc != VERR_BUFFER_OVERFLOW)
-                finish = true;
-        }
         if (VERR_BUFFER_OVERFLOW == rc)
-            /* VERR_BUFFER_OVERFLOW has a different meaning here as a
-             * return code, but we need to report the race. */
-            rc = VERR_TOO_MUCH_DATA;
-    }
+            /* Leave a bit of extra space to be safe */
+            cchBuf += 1024;
+        else
+            finish = true;
+    }
+    if (VERR_BUFFER_OVERFLOW == rc)
+        /* VERR_BUFFER_OVERFLOW has a different meaning here as a
+         * return code, but we need to report the race. */
+        rc = VERR_TOO_MUCH_DATA;
     if (RT_SUCCESS(rc))
         *ppszValue = pszValue;