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

Timestamp:

Nov 4, 2009 9:52:10 AM (15 years ago)

Author:

vboxsync

Message:

VBoxGuestR3Lib: Fixes for memory (de)allocation in host version reporting (provided by Huihong Luo).

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• VBoxGuestR3LibHostVersion.cpp (modified) (2 diffs)
• VBoxGuestR3LibMisc.cpp (modified) (4 diffs)

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

@@ -85 +85 @@
     Assert(ppszHostVersion);
     Assert(ppszGuestVersion);
+
+    *ppszHostVersion = NULL;
+    *ppszGuestVersion = NULL;
 
     /* We assume we have an update initially.
@@ -171 +174 @@
     if (RT_FAILURE(rc))
     {
-        VbglR3GuestPropReadValueFree(*ppszHostVersion);
-        VbglR3GuestPropReadValueFree(*ppszGuestVersion);
+        if (*ppszHostVersion)
+            VbglR3GuestPropReadValueFree(*ppszHostVersion);
+        if (*ppszGuestVersion)
+            VbglR3GuestPropReadValueFree(*ppszGuestVersion);
     }
     return rc;

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

@@ -223 +223 @@
 
     /* Still no luck? Then try the old xVM paths ... */
-    if (FAILED(r))
+    if (r != ERROR_SUCCESS)
     {
         r = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
@@ -236 +236 @@
 
     /* Did we get something worth looking at? */
-    if (SUCCEEDED(r))
+    if (r == ERROR_SUCCESS)
     {
         /* Version. */
@@ -262 +262 @@
         }
     }
-    rc = RTErrConvertFromWin32(r);
+    else
+    {
+        /* No registry entries found, return the compile-time version string atm. */
+        /* Version. */
+        if (ppszVer)
+            rc = RTStrAPrintf(ppszVer, "%s", VBOX_VERSION_STRING);
+        /* Revision. */
+        if (ppszRev)
+            rc = RTStrAPrintf(ppszRev, "%s", VBOX_SVN_REV);
+    }
     if (NULL != hKey)
         RegCloseKey(hKey);
-#else /* !RT_OS_WINDOWS */
+# else /* !RT_OS_WINDOWS */
     /* On non-Windows platforms just return the compile-time version string atm. */
     /* Version. */
@@ -273 +282 @@
     if (ppszRev)
         rc = RTStrAPrintf(ppszRev, "%s", VBOX_SVN_REV);
-#endif /* !RT_OS_WINDOWS */
-    return rc;
-}
+# endif /* !RT_OS_WINDOWS */
+    return rc;
+}