diff -ur dbus-1.3.1/tools/dbus-launch.c dbus-herzi/tools/dbus-launch.c
--- dbus-1.3.1/tools/dbus-launch.c	2010-05-20 21:22:12.000000000 +0200
+++ dbus-herzi/tools/dbus-launch.c	2010-09-07 15:26:44.607135509 +0200
@@ -711,7 +711,11 @@
         size_t len = strlen (argv[remaining_args+i-1])+1;
         args[i] = malloc (len);
         if (!args[i])
-          goto oom;
+          {
+            free (envvar);
+            free (argv);
+            goto oom;
+          }
         strncpy (args[i], argv[remaining_args+i-1], len);
        }
      args[i] = NULL;