Changeset 24390 in vbox

Timestamp:

Nov 5, 2009 2:44:51 PM (15 years ago)

Author:

vboxsync

Message:

VbglR3GetAdditionsVersion: Missing RTStrFree on failure. Fixed uninitialized rc warning. Fixed the #ifdef indentation again.

File:

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

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

@@ -238 +238 @@
 VBGLR3DECL(int) VbglR3GetAdditionsVersion(char **ppszVer, char **ppszRev)
 {
-# ifdef RT_OS_WINDOWS
+#ifdef RT_OS_WINDOWS
     /*
      * Try get the *installed* version first.
@@ -269 +269 @@
 
     /* Did we get something worth looking at? */
-    int rc;
+    int rc = VINF_SUCCESS;
     if (r == ERROR_SUCCESS)
     {
@@ -321 +321 @@
             else
                 rc = VERR_NO_MEMORY;
+
+            if (RT_FAILURE(rc) && ppszVer)
+            {
+                RTStrFree(*ppszVer);
+                *ppszVer = NULL;
+            }
         }
         if (hKey != NULL)
@@ -335 +341 @@
     return rc;
 
-# else /* !RT_OS_WINDOWS */
+#else  /* !RT_OS_WINDOWS */
     /*
      * On non-Windows platforms just return the compile-time version string.
      */
     return vbglR3GetAdditionsCompileTimeVersion(ppszVer, ppszRev);
-# endif /* !RT_OS_WINDOWS */
-}
+#endif /* !RT_OS_WINDOWS */
+}
+