forked from pool/systemd
48af67da26
- udev: path_id - handle Hyper-V devices
add: 1008-udev-path_id-handle-Hyper-V-devices.patch
- keymap: Update the list of Samsung Series 9 models
add: 1009-keymap-Update-the-list-of-Samsung-Series-9-models.patch
- keymap: Add Samsung 700T
add: 1010-keymap-Add-Samsung-700T.patch
- libudev: avoid leak during realloc failure
add: 1011-libudev-avoid-leak-during-realloc-failure.patch
- libudev: do not resolve $attr{device} symlinks
add: 1012-libudev-do-not-resolve-attr-device-symlinks.patch
- libudev: validate 'udev' argument to udev_enumerate_new()
add: 1013-libudev-validate-udev-argument-to-udev_enumerate_new.patch
- udev: fix whitespace
add: 1014-udev-fix-whitespace.patch
- udev: properly handle symlink removal by 'change' event
add: 1015-udev-properly-handle-symlink-removal-by-change-event.patch
- udev: builtin - do not fail builtin initialization if one of
them returns an error
add: 1016-udev-builtin-do-not-fail-builtin-initialization-if-o.patch
- udev: use usec_t and now()
add: 1017-udev-use-usec_t-and-now.patch
closing an non-existent dbus connection and getting assertion
failures.
- udev: path_id - handle Hyper-V devices
add: 1008-udev-path_id-handle-Hyper-V-devices.patch
- keymap: Update the list of Samsung Series 9 models
add: 1009-keymap-Update-the-list-of-Samsung-Series-9-models.patch
- keymap: Add Samsung 700T
add: 1010-keymap-Add-Samsung-700T.patch
OBS-URL: https://build.opensuse.org/request/show/147673
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=120
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
From 645a9e5a2bbb06464a3fba1a3501e9d79e5bbad8 Mon Sep 17 00:00:00 2001
|
|
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
|
Date: Wed, 31 Oct 2012 11:53:56 +0100
|
|
Subject: [PATCH] dbus-manager: fix a fatal dbus abort in
|
|
bus_manager_message_handler()
|
|
|
|
If ListUnitFiles fails, or an OOM occurs, then dbus_message_unref()
|
|
will be called twice on "reply", causing systemd to crash. So remove
|
|
the call to dbus_message_unref(); it is unnecessary because of
|
|
the cleanup attribute on "reply".
|
|
|
|
[zj: modified to leave one dbus_message_unref() alone, per Colin
|
|
Walters' comment.]
|
|
---
|
|
src/core/dbus-manager.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
Index: systemd-195/src/core/dbus-manager.c
|
|
===================================================================
|
|
--- systemd-195.orig/src/core/dbus-manager.c
|
|
+++ systemd-195/src/core/dbus-manager.c
|
|
@@ -1432,7 +1432,6 @@ static DBusHandlerResult bus_manager_mes
|
|
r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h);
|
|
if (r < 0) {
|
|
unit_file_list_free(h);
|
|
- dbus_message_unref(reply);
|
|
return bus_send_error_reply(connection, message, NULL, r);
|
|
}
|
|
|