summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorChristian Dywan <christian.dywan@lanedo.com>2010-07-20 12:50:23 +0200
committerWill Thompson <will.thompson@collabora.co.uk>2010-10-05 13:47:07 +0100
commitb1f947da1a25b41cf1373a31d8fdd632b78e25cd (patch)
tree703e024320b4be396f548b6e7d8e9545ad54baec /tools
parent4510983f13c8a403a0e4a916119667f24920bdd5 (diff)
downloaddbus-b1f947da1a25b41cf1373a31d8fdd632b78e25cd.tar.gz
Free envvar and args in pass_info in the oom case
Diffstat (limited to 'tools')
-rw-r--r--tools/dbus-launch.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 6fa9c92b..ce9c7b1c 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])