summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-sysdeps.c
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2004-10-25 18:48:58 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2004-10-25 18:48:58 +0000
commit4612de0198e3417ca710be2bd0c27f4445c6766a (patch)
tree04fd07452e9bed8256743fcf744974370eaee58e /dbus/dbus-sysdeps.c
parent41a9bdeba10efe28adc34756535578a38a4db7af (diff)
John (J5) Palmieri <johnp@redhat.com>
* dbus/dbus-sysdeps.c (fill_user_info): On errors do not free the DBusUserInfo structure since this is passed into the function. This would cause a double free when the function that allocated the structure would try to free it when an error occured. * (bus/session.conf.in, bus/Makefile.am, dbus/configure.in): use /usr/share/dbus-1/services instead of /usr/lib/dbus-1.0/services for service activation to avoid 32bit/64bit parallel install issues
Diffstat (limited to 'dbus/dbus-sysdeps.c')
-rw-r--r--dbus/dbus-sysdeps.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 80188e48..e1b786f0 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -1566,7 +1566,6 @@ fill_user_info (DBusUserInfo *info,
failed:
_DBUS_ASSERT_ERROR_IS_SET (error);
- _dbus_user_info_free (info);
return FALSE;
}