Changeset 46908 in vbox

Timestamp:

Jul 2, 2013 1:28:36 PM (12 years ago)

Author:

vboxsync

Message:

server.cpp: Fixed memory leak, bail out when unable to build logfile name.

File:

• trunk/src/VBox/Main/src-server/xpcom/server.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/xpcom/server.cpp

@@ -880 +880 @@
     nsresult rc;
 
+    char szLogFile[RTPATH_MAX];
     if (!pszLogFile)
     {
-        char szLogFile[RTPATH_MAX] = "";
         vrc = com::GetVBoxUserHomeDirectory(szLogFile, sizeof(szLogFile));
-        if (vrc == VERR_ACCESS_DENIED)
-            return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open global settings directory '%s'", szLogFile);
         if (RT_SUCCESS(vrc))
             vrc = RTPathAppend(szLogFile, sizeof(szLogFile), "VBoxSVC.log");
-        if (RT_SUCCESS(vrc))
-            pszLogFile = RTStrDup(szLogFile);
-        if (RT_FAILURE(vrc))
-            return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to determine release log file (%Rrc)", vrc);
-    }
+    }
+    else
+    {
+        if (!RTStrPrintf(szLogFile, sizeof(szLogFile), "%s", pszLogFile))
+            vrc = VERR_NO_MEMORY;
+    }
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to create logging file name, rc=%Rrc", vrc);
+
     char szError[RTPATH_MAX + 128];
-    vrc = com::VBoxLogRelCreate("XPCOM Server", pszLogFile,
+    vrc = com::VBoxLogRelCreate("XPCOM Server", szLogFile,
                                 RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,
                                 "all", "VBOXSVC_RELEASE_LOG",