Changeset 24372 in vbox for trunk/src/VBox

Timestamp:

Nov 5, 2009 9:41:42 AM (15 years ago)

Author:

vboxsync

Message:

VBoxGuestR3LibMisc: Better memory handling.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp (modified) (4 diffs)

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

@@ -242 +242 @@
      * Try get the *installed* version first.
      */
-    int rc = VINF_SUCCESS;
     HKEY hKey;
     LONG r;
@@ -270 +269 @@
 
     /* Did we get something worth looking at? */
+    int rc;
     if (r == ERROR_SUCCESS)
     {
@@ -284 +284 @@
         DWORD dwType;
         DWORD dwSize = 32;
+        char *pszTmp;
         if (ppszVer)
         {
-            char *pszVer = (char*)RTMemAlloc(dwSize);
-            if (pszVer)
+            pszTmp = (char*)RTMemAlloc(dwSize);
+            if (pszTmp)
             {
-                if (ERROR_SUCCESS == RegQueryValueEx(hKey, "Version", NULL, &dwType, (BYTE*)(LPCTSTR)pszVer, &dwSize))
-                    *ppszVer = pszVer;
+                r = RegQueryValueEx(hKey, "Version", NULL, &dwType, (BYTE*)(LPCTSTR)pszTmp, &dwSize);
+                if (r == ERROR_SUCCESS)
+                    rc = RTStrDupEx(ppszVer, pszTmp);
+                else
+                    rc = RTErrConvertFromNtStatus(r);
+                RTMemFree(pszTmp);
             }
+            else
+                rc = VERR_NO_MEMORY;
         }
         /* Revision. */
@@ -297 +304 @@
         {
             dwSize = 32; /* Reset */
-            char *pszRev = (char*)RTMemAlloc(dwSize);
-            if (pszRev)
+            pszTmp = (char*)RTMemAlloc(dwSize);
+            if (pszTmp)
             {
-                if (ERROR_SUCCESS == RegQueryValueEx(hKey, "Revision", NULL, &dwType, (BYTE*)(LPCTSTR)pszRev, &dwSize))
-                    *ppszRev = pszRev;
+                r = RegQueryValueEx(hKey, "Revision", NULL, &dwType, (BYTE*)(LPCTSTR)pszTmp, &dwSize);
+                if (r == ERROR_SUCCESS)
+                    rc = RTStrDupEx(ppszRev, pszTmp);
+                else
+                    rc = RTErrConvertFromNtStatus(r);
+                RTMemFree(pszTmp);
             }
+            else
+                rc = VERR_NO_MEMORY;
         }
     }