From be952bebb3647069fb93b9791ee3439698f697ca Mon Sep 17 00:00:00 2001 From: Alexander Vershilov Date: Wed, 29 Oct 2014 23:16:35 +0300 Subject: [PATCH] Fix incorrect handling of chroot option. Fixes #28. X-Gentoo-Bug: #527370 X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=527370 --- src/librc/librc-daemon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librc/librc-daemon.c b/src/librc/librc-daemon.c index 190a0146..02aff5a9 100644 --- a/src/librc/librc-daemon.c +++ b/src/librc/librc-daemon.c @@ -556,8 +556,8 @@ rc_service_daemons_crashed(const char *service) char *ch_root = rc_service_value_get(basename_c(service), "chroot"); char *spidfile = pidfile; - if (ch_root) { - spidfile = malloc(strlen(ch_root) + strlen(pidfile)); + if (ch_root && pidfile) { + spidfile = xmalloc(strlen(ch_root) + strlen(pidfile) + 1); strcpy(spidfile, ch_root); strcat(spidfile, pidfile); }