Changeset 10834 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 23, 2008 3:02:33 PM (17 years ago)

Author:

vboxsync

Message:

Additions/common: guest property fixes

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

@@ -907 +907 @@
         for (unsigned i = 0; (i < 10) && !finish; ++i)
         {
-            pvBuf = RTMemRealloc(pvBuf, cbBuf);
-            if (NULL == pvBuf)
+            void *pvTmpBuf = RTMemRealloc(pvBuf, cbBuf);
+            if (NULL == pvTmpBuf)
             {
+                RTMemFree(pvBuf);
                 rc = VERR_NO_MEMORY;
                 VBoxControlError("Out of memory\n");
             }
             else
+            {
+                pvBuf = pvTmpBuf;
                 rc = VbglR3GuestPropRead(u32ClientId, pszName, pvBuf, cbBuf,
                                          &pszValue, &u64Timestamp, &pszFlags,
                                          &cbBuf);
+            }
             if (VERR_BUFFER_OVERFLOW == rc)
                 /* Leave a bit of extra space to be safe */
@@ -943 +947 @@
     if (u32ClientId != 0)
         VbglR3GuestPropDisconnect(u32ClientId);
-    VbglR3GuestPropReadValueFree(pszValue);
     return RT_SUCCESS(rc) ? 0 : 1;
 }

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

@@ -270 +270 @@
     for (unsigned i = 0; (i < 10) && !finish; ++i)
     {
-        pvBuf = RTMemRealloc(pvBuf, cchBuf);
-        if (NULL == pvBuf)
+        void *pvTmpBuf = RTMemRealloc(pvBuf, cchBuf);
+        if (NULL == pvTmpBuf)
+        {
+            RTMemFree(pvBuf);
             rc = VERR_NO_MEMORY;
+        }
         else
+        {
+            pvBuf = pvTmpBuf;
             rc = VbglR3GuestPropRead(u32ClientId, pszName, pvBuf, cchBuf,
                                      &pszValue, NULL, NULL, &cchBuf);
+        }
         if (VERR_BUFFER_OVERFLOW == rc)
             /* Leave a bit of extra space to be safe */