File 0004-fix-off-by-one-error-in-array-index-assert... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-fix-off-by-one-error-in-array-index-assertion.patch of Package systemd (Revision d5c9e1ff640cee352ef88fd79248d974)

Currently displaying revision d5c9e1ff640cee352ef88fd79248d974 , Show latest

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

Places

File 0004-fix-off-by-one-error-in-array-index-assertion.patch of Package systemd (Revision d5c9e1ff640cee352ef88fd79248d974)

Places