From c46cee45204e1d54f20095339d96dcefd4a97e09 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 1 May 2015 07:56:27 +0200
Subject: [PATCH] inc: don't send signal to stale process; fixes #159

---
 src/etc/inc/util.inc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc
index dcaae383f..3d9b6c50e 100644
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -37,7 +37,7 @@ function killbyname($procname, $sig = 'TERM')
 
 function killbypid($pidfile, $sig = 'TERM')
 {
-	if (!file_exists($pidfile)) {
+	if (!isvalidpid($pidfile)) {
 		return;
 	}
 
@@ -46,12 +46,11 @@ function killbypid($pidfile, $sig = 'TERM')
 
 function isvalidpid($pidfile)
 {
-	$output = "";
-	if (file_exists($pidfile)) {
-		exec("/bin/pgrep -nF {$pidfile}", $output, $retval);
-		return (intval($retval) == 0);
+	if (!file_exists($pidfile)) {
+		return false;
 	}
-	return false;
+
+	return mwexecf('/bin/pgrep -nF %s', $pidfile) == 0;
 }
 
 function is_process_running($process)