Blob Blame History Raw
From 54461c902d71e43fd5cc0010e0352903685c3974 Mon Sep 17 00:00:00 2001
From: Yuxuan Shui <yshuiv7@gmail.com>
Date: Sat, 15 Feb 2014 13:20:55 +0800
Subject: [PATCH] core: check for return value from get_process_state

Fix for commit e10c9985bb.
---
 src/core/service.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/core/service.c b/src/core/service.c
index 3eacf3b..f6fdbbc 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1429,11 +1429,17 @@ static int service_load_pid_file(Service *s, bool may_warn) {
                 return -ESRCH;
         }
 
-        if (get_process_state(pid) == 'Z') {
+        r = get_process_state(pid);
+        if (r < 0) {
+                if (may_warn)
+                        log_info_unit(UNIT(s)->id, "Failed to read /proc/%d/stat: %s",
+                                      pid, strerror(-r));
+                return r;
+        } else if (r == 'Z') {
                 if (may_warn)
                         log_info_unit(UNIT(s)->id,
-                                      "PID "PID_FMT" read from file %s is a zombie.",
-                                      pid, s->pid_file);
+                                      "PID %lu read from file %s is a zombie.",
+                                      (unsigned long) pid, s->pid_file);
                 return -ESRCH;
         }