Changeset 43062 in vbox for trunk/src/VBox

Timestamp:

Aug 29, 2012 9:46:14 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80403

Message:

Main/GuestProcessImpl: Fixed leak when building up argv vector.

File:

• trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -1083 +1083 @@
         char *pszArgs = NULL;
         size_t cArgs = mData.mProcess.mArguments.size();
-        if (cArgs)
-        {
-            char **papszArgv = (char**)RTMemAlloc(sizeof(char*) * (cArgs + 1));
+        if (cArgs >= UINT32_MAX)
+            vrc = VERR_BUFFER_OVERFLOW;
+
+        if (   RT_SUCCESS(vrc)
+            && cArgs)
+        {
+            char **papszArgv = (char**)RTMemAlloc((cArgs + 1) * sizeof(char*));
             AssertReturn(papszArgv, VERR_NO_MEMORY);
-            for (size_t i = 0; RT_SUCCESS(vrc) && i < cArgs; i++)
-                vrc = RTStrDupEx(&papszArgv[i], mData.mProcess.mArguments[i].c_str());
+
+            for (size_t i = 0; i < cArgs && RT_SUCCESS(vrc); i++)
+            {
+                const char *pszCurArg = mData.mProcess.mArguments[i].c_str();
+                AssertPtr(pszCurArg);
+                vrc = RTStrDupEx(&papszArgv[i], pszCurArg);
+            }
             papszArgv[cArgs] = NULL;
 
             if (RT_SUCCESS(vrc))
                 vrc = RTGetOptArgvToString(&pszArgs, papszArgv, RTGETOPTARGV_CNV_QUOTE_MS_CRT);
-        }
-        size_t cbArgs = pszArgs ? strlen(pszArgs) + 1 : 0; /* Include terminating zero. */
+
+            if (papszArgv)
+            {
+                size_t i = 0;
+                while (papszArgv[i])
+                    RTStrFree(papszArgv[i++]);
+                RTMemFree(papszArgv);
+            }
+        }
+
+        /* Calculate arguments size (in bytes). */
+        size_t cbArgs = 0;
+        if (RT_SUCCESS(vrc))
+            cbArgs = pszArgs ? strlen(pszArgs) + 1 : 0; /* Include terminating zero. */
 
         /* Prepare environment. */
         void *pvEnv = NULL;
         size_t cbEnv = 0;
-        vrc = mData.mProcess.mEnvironment.BuildEnvironmentBlock(&pvEnv, &cbEnv, NULL /* cEnv */);
+        if (RT_SUCCESS(vrc))
+            vrc = mData.mProcess.mEnvironment.BuildEnvironmentBlock(&pvEnv, &cbEnv, NULL /* cEnv */);
 
         if (RT_SUCCESS(vrc))