fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-05 08:50:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus-launch: unconditionally use SIGHUP and free memory on OOM

Browse source 
In a previous patch, it check SIGHUP for windows, however, in fact there
is dbus-launch-win.c supposed to be used on windows. So just use SIGHUP
unconditionally.

Also free memory on OOM, although this doesn't make much sense since
this is a oneshort program, rather than a daemon.

Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
[fixed whitespace -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66068
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
Chengwei Yang 2013-06-27 09:13:57 +08:00 • committed by Simon McVittie
parent 3357f484e0
commit fbeac8820a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/dbus-launch.c
View file

@ -451,9 +451,7 @@ signal_handler (int sig)
{
switch (sig)
{
#ifdef SIGHUP
case SIGHUP:
#endif
case SIGINT:
case SIGTERM:
got_sighup = TRUE;
@ -769,7 +767,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])
goto oom;
{
while (i > 1)
free (args[--i]);
goto oom;
}
strncpy (args[i], argv[remaining_args+i-1], len);
}
args[i] = NULL;