From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2393B138A1D for ; Sat, 1 Nov 2014 22:05:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97339E1123; Sat, 1 Nov 2014 22:05:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 478F2E1123 for ; Sat, 1 Nov 2014 22:05:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 444C13403E5 for ; Sat, 1 Nov 2014 22:05:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5C2F93C5 for ; Sat, 1 Nov 2014 22:05:53 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1414878270.be952bebb3647069fb93b9791ee3439698f697ca.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/librc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/librc/librc-daemon.c X-VCS-Directories: src/librc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: be952bebb3647069fb93b9791ee3439698f697ca X-VCS-Branch: master Date: Sat, 1 Nov 2014 22:05:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 04a3d442-20a9-42ae-b0b8-6f1db8887291 X-Archives-Hash: ddae0c9401996c33f2e744ec4a22c09c commit: be952bebb3647069fb93b9791ee3439698f697ca Author: Alexander Vershilov gmail com> AuthorDate: Wed Oct 29 20:16:35 2014 +0000 Commit: William Hubbs gentoo org> CommitDate: Sat Nov 1 21:44:30 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=be952beb 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 190a014..02aff5a 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); }