From: Christian Dywan <christian.dywan@lanedo.com>
Date: Tue, 20 Jul 2010 10:50:23 +0000 (+0200)
Subject: Free envvar and args in pass_info in the oom case
X-Git-Tag: dbus-1.4.1~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1f947da1a25b41cf1373a31d8fdd632b78e25cd;p=thirdparty%2Fdbus.git

Free envvar and args in pass_info in the oom case
---

diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 6fa9c92bf..ce9c7b1c1 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -701,7 +701,11 @@ pass_info (const char *runprog, const char *bus_address, pid_t bus_pid,
       args = malloc (sizeof (char *) * ((argc-remaining_args)+2));
 
       if (envvar == NULL || args == NULL)
-        goto oom;
+        {
+          free (envvar);
+          free (args);
+          goto oom;
+        }
 
      args[0] = xstrdup (runprog);
       if (!args[0])