From 05113318e280904f2a1ce3721b8d6504afd7e7df Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Fri, 16 Dec 2011 10:45:46 -0500
Subject: Reorder pidfile() function to guarantee NULL-termination

Coverity 12400
---
 src/util/server.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/util/server.c b/src/util/server.c
index 0c9501b1f..a9be4be1a 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -117,9 +117,6 @@ int pidfile(const char *path, const char *name)
     fd = open(file, O_RDONLY, 0644);
     err = errno;
     if (fd != -1) {
-
-        pid_str[pidlen] = '\0';
-
         len = 0;
         while ((ret = read(fd, pid_str + len, pidlen - len)) != 0) {
             if (ret == -1) {
@@ -141,6 +138,9 @@ int pidfile(const char *path, const char *name)
             }
         }
 
+        /* Ensure NULL-termination */
+        pid_str[len] = '\0';
+
         if (ret == 0) {
             /* let's check the pid */
 
-- 
cgit