aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Vershilov <alexander.vershilov@gmail.com>2014-10-29 23:16:35 +0300
committerWilliam Hubbs <w.d.hubbs@gmail.com>2014-11-01 16:44:30 -0500
commitbe952bebb3647069fb93b9791ee3439698f697ca (patch)
tree15bd6130e474a7d5b288cc8f6109e69c23230e01
parent0bfde472d0154f14ea88c0f5ddd21a510443d713 (diff)
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
-rw-r--r--src/librc/librc-daemon.c4
1 files 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);
}