Changeset 46907 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 2, 2013 1:25:11 PM (11 years ago)

Author:

vboxsync

Message:

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

File:

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

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -328 +328 @@
     if (fRun)
     {
+        char szLogFile[RTPATH_MAX];
         if (!pszLogFile)
         {
-            char szLogFile[RTPATH_MAX];
             vrc = com::GetVBoxUserHomeDirectory(szLogFile, sizeof(szLogFile));
             if (RT_SUCCESS(vrc))
                 vrc = RTPathAppend(szLogFile, sizeof(szLogFile), "VBoxSVC.log");
-            if (RT_SUCCESS(vrc))
-                pszLogFile = RTStrDup(szLogFile);
-        }
+        }
+        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("COM Server", pszLogFile,
+        vrc = com::VBoxLogRelCreate("COM Server", szLogFile,
                                     RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,
                                     "all", "VBOXSVC_RELEASE_LOG",