forked from pool/systemd
74bf6f2e1d
- Add patch getty-generator-with-serial-3270-tty.patch to avoid harmless error messages on not existing getty@3270 files - Replace systemd-big-endian-reply-matching.patch with upstream 0001-sd-bus-don-t-look-for-a-64bit-value-when-we-only-hav.patch to solve broken systemd communication with and over dbus (bnc#866732) - Readd patch 1008-add-msft-compability-rules.patch for older code base as 13.1 - Modify pre_checkin.sh to throw an error if a patch will be applied which modifies one of Makefile.am, Makefile.in, or configiure.ac as this breaks bootstrapping - Add second version of make-209-working-on-older-dist.patch to be able to apply for bootstrapping version - Don't require non-existing binutils-gold - Avoid file conflict between udev and systemd (bnc#868230) - Modify patch module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch to ignore if /etc/sysconfig/kernel does not exist (bnc#865834) - Add patch systemd-big-endian-reply-matching.patch make sure that systemd can talk with dbus-daemon even on big endian systems (bnc#866732) ----------------------------------------------------------------- - Due to previous reason, resurrect systemd-dbus-system-bus-address.patch - Removed pkgconfig(dbus-1) BuildRequires - with 209 and newer, itis only needed for quering default DBus directories, which we nowpass to configure. OBS-URL: https://build.opensuse.org/request/show/225960 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=178
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 26abdc73a212b90f7c4b71808a1028d2e87ab09f Mon Sep 17 00:00:00 2001
|
|
From: Dave Reisner <dreisner@archlinux.org>
|
|
Date: Sat, 8 Mar 2014 17:32:53 -0500
|
|
Subject: [PATCH] fix off by one error in array index assertion
|
|
|
|
Since the index is already post-incremented when the array is appended
|
|
to, this assertion can be wrongly reached when the array is at capacity
|
|
(with the NULL terminator). The bug is reproducible on shutdown with
|
|
the following settings in /etc/systemd/system.conf:
|
|
|
|
LogTarget=journal-or-kmsg
|
|
LogColor=yes
|
|
LogLocation=yes
|
|
|
|
Reported by Thermi on IRC.
|
|
---
|
|
src/core/main.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git src/core/main.c src/core/main.c
|
|
index 6ebfe64..f1b06d8 100644
|
|
--- src/core/main.c
|
|
+++ src/core/main.c
|
|
@@ -1994,7 +1994,7 @@ finish:
|
|
if (log_get_show_location())
|
|
command_line[pos++] = "--log-location";
|
|
|
|
- assert(pos + 1 < ELEMENTSOF(command_line));
|
|
+ assert(pos < ELEMENTSOF(command_line));
|
|
|
|
if (arm_reboot_watchdog && arg_shutdown_watchdog > 0) {
|
|
char *e;
|
|
--
|
|
1.7.9.2
|
|
|