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

Timestamp:

Feb 6, 2013 2:04:14 PM (12 years ago)

Author:

vboxsync

Message:

Forward ported r83625 + r83626 (VBoxServiceVMInfo: Don't NULL LA client info, check for more pointers, VBoxServiceUtils: Pointer checks, don't leak property values if access is denied).

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceUtils.cpp (modified) (3 diffs)
• VBoxServiceVMInfo.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp

@@ -111 +111 @@
     }
 
-    RTMemFree(pvBuf);
+    if (pvBuf)
+        RTMemFree(pvBuf);
     return rc;
 }
@@ -168 +169 @@
                             char **ppszValue, char **ppszFlags, uint64_t *puTimestamp)
 {
-    char *pszFlags;
-    int rc = VBoxServiceReadProp(u32ClientId, pszPropName, ppszValue, &pszFlags, puTimestamp);
+    AssertPtrReturn(ppszValue, VERR_INVALID_PARAMETER);
+
+    char *pszValue = NULL;
+    char *pszFlags = NULL;
+    int rc = VBoxServiceReadProp(u32ClientId, pszPropName, &pszValue, &pszFlags, puTimestamp);
     if (RT_SUCCESS(rc))
     {
@@ -181 +185 @@
         }
 
-        if (ppszFlags)
-            *ppszFlags = pszFlags;
+        if (RT_SUCCESS(rc))
+        {
+            *ppszValue = pszValue;
+
+            if (ppszFlags)
+                *ppszFlags = pszFlags;
+            else if (pszFlags)
+                RTStrFree(pszFlags);
+        }
         else
-            RTStrFree(pszFlags);
+        {
+            if (pszValue)
+                RTStrFree(pszValue);
+            if (pszFlags)
+                RTStrFree(pszFlags);
+        }
     }
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -307 +307 @@
     {
         if (pClient->pszName)
+        {
             RTStrFree(pClient->pszName);
+            pClient->pszName = NULL;
+        }
         if (pClient->pszLocation)
+        {
             RTStrFree(pClient->pszLocation);
+            pClient->pszLocation = NULL;
+        }
         if (pClient->pszDomain)
+        {
             RTStrFree(pClient->pszDomain);
-
-        pClient = NULL;
+            pClient->pszDomain = NULL;
+        }
     }
 }
@@ -753 +760 @@
     if (pszUserList)
         RTStrFree(pszUserList);
+
+    VBoxServiceVerbose(4, "Writing users returned with rc=%Rrc\n", rc);
     return rc;
 }
@@ -1192 +1201 @@
 
         /* Check for new connection. */
-        char *pszLAClientID;
+        char *pszLAClientID = NULL;
         int rc2 = VBoxServiceReadHostProp(g_uVMInfoGuestPropSvcClientID, g_pszLAActiveClient, true /* Read only */,
                                           &pszLAClientID, NULL /* Flags */, NULL /* Timestamp */);
         if (RT_SUCCESS(rc2))
         {
+            AssertPtr(pszLAClientID);
             if (RTStrICmp(pszLAClientID, "0")) /* Is a client connected? */
             {
@@ -1259 +1269 @@
         }
 
+        VBoxServiceVerbose(3, "VRDP: Handling location awareness done\n");
+
         /*
          * Flush all properties if we were restored.