Attachment 81248 Details for Bug 66068 – [PATCH 3/5] dbus-launch: check SIGHUP definition and free args on failure

[patch] [PATCH 3/5] dbus-launch: check SIGHUP definition and free args on failure

0003-dbus-launch-check-SIGHUP-definition-and-free-args-on.patch (text/plain), 1.22 KB, created by Chengwei Yang on 2013-06-23 06:45:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-06-23 06:45:32 UTC

Size: 1.22 KB

patch

obsolete

>From b67c2ac413ac7d4be1660bb626284328b6521143 Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Sun, 23 Jun 2013 10:52:24 +0800
>Subject: [PATCH 3/5] dbus-launch: check SIGHUP definition and free args on
> failure
>
>Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
>---
> tools/dbus-launch.c |    7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
>index f34072a..beea27e 100644
>--- a/tools/dbus-launch.c
>+++ b/tools/dbus-launch.c
>@@ -475,7 +475,9 @@ kill_bus_when_session_ends (void)
>   act.sa_handler = signal_handler;
>   act.sa_mask    = empty_mask;
>   act.sa_flags   = 0;
>+#ifdef SIGHUP
>   sigaction (SIGHUP,  &act, NULL);
>+#endif
>   sigaction (SIGTERM,  &act, NULL);
>   sigaction (SIGINT,  &act, NULL);
>   
>@@ -766,8 +768,11 @@ pass_info (const char *runprog, const char *bus_address, pid_t bus_pid,
>         {
>           size_t len = strlen (argv[remaining_args+i-1])+1;
>           args[i] = malloc (len);
>-          if (!args[i])
>+          if (!args[i]) {
>+            while (i > 1)
>+              free(args[--i]);
>             goto oom;
>+	  }
>           strncpy (args[i], argv[remaining_args+i-1], len);
>         }
>       args[i] = NULL;
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 66068: 81246 | 81247 | 81248 | 81249 | 81250 | 81467 | 81468 | 81470 | 81471 | 81519

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.