儲存庫 vbox 的更動 37262

時間撮記:

2011-5-30 下午02:13:17 (13 年 以前)

作者:

vboxsync

訊息:

VBoxGuestR3LibAdditions.cpp: Don't crashin in the failure path when any of the ppsz values are NULL. Use static, pretty pleeeease. :-)

檔案:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp (修改) (4 筆差異)

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

@@ -188 +188 @@
  * @param   cchBuffer               Size (in bytes) of buffer.
  */
-int vbglR3QueryRegistryString(HKEY hKey, const char *pszValName, char *pszBuffer, size_t cchBuffer)
+static int vbglR3QueryRegistryString(HKEY hKey, const char *pszValName, char *pszBuffer, size_t cchBuffer)
 {
     AssertReturn(pszValName, VERR_INVALID_PARAMETER);
@@ -194 +194 @@
     AssertReturn(cchBuffer, VERR_INVALID_PARAMETER);
 
-    int rc = VINF_SUCCESS;
-
+    int rc;
     DWORD dwType;
     DWORD dwSize = (DWORD)cchBuffer;
-    LONG lRet = RegQueryValueEx(hKey, pszValName, NULL, &dwType, (BYTE*)(LPCTSTR)pszBuffer, &dwSize);
+    LONG lRet = RegQueryValueEx(hKey, pszValName, NULL, &dwType, (BYTE *)pszBuffer, &dwSize);
     if (lRet == ERROR_SUCCESS)
-    {
-        rc = dwType == REG_SZ
-                     ? VINF_SUCCESS : VERR_INVALID_PARAMETER;
-    }
+        rc = dwType == REG_SZ ? VINF_SUCCESS : VERR_INVALID_PARAMETER;
     else
         rc = RTErrConvertFromWin32(lRet);
@@ -232 +228 @@
      */
     if (ppszVer)
-        *ppszVer   = NULL;
+        *ppszVer    = NULL;
     if (ppszVerExt)
         *ppszVerExt = NULL;
     if (ppszRev)
-        *ppszRev   = NULL;
-
+        *ppszRev    = NULL;
 
 #ifdef RT_OS_WINDOWS
@@ -277 +272 @@
         if (RT_SUCCESS(rc))
             rc = rc2;
-        else
-        {
-            /* Clean up allocated strings on error. */
-            if (*ppszVer)
+
+        /* Clean up allocated strings on error. */
+        if (RT_FAILURE(rc))
+        {
+            if (ppszVer)
                 RTStrFree(*ppszVer);
-            if (*ppszVerExt)
+            if (ppszVerExt)
                 RTStrFree(*ppszVerExt);
-            if (*ppszRev)
+            if (ppszRev)
                 RTStrFree(*ppszRev);
         }