]> granicus.if.org Git - procps-ng/commitdiff
0004-pgrep: Replace buf+1 with buf in read_pidfile().
authorQualys Security Advisory <qsa@qualys.com>
Thu, 1 Jan 1970 00:00:00 +0000 (00:00 +0000)
committerCraig Small <csmall@enc.com.au>
Sat, 23 Jun 2018 11:59:14 +0000 (21:59 +1000)
Unless we missed something, this makes it unnecessarily difficult to
read/audit.

pgrep.c

diff --git a/pgrep.c b/pgrep.c
index 36936900e2c1e98955747b89b52145089eb60ded..ffe0f32a11df84a1b5a048d4486cf7de16c356cb 100644 (file)
--- a/pgrep.c
+++ b/pgrep.c
@@ -266,11 +266,11 @@ static struct el *read_pidfile(void)
     if(opt_lock && !has_flock(fd) && !has_fcntl(fd))
         goto out;
     memset(buf,'\0',sizeof buf);
-    n = read(fd,buf+1,sizeof buf-2);
+    n = read(fd,buf,sizeof buf-1);
     if (n<1)
         goto out;
-    pid = strtoul(buf+1,&endp,10);
-    if(endp<=buf+1 || pid<1 )
+    pid = strtoul(buf,&endp,10);
+    if(endp<=buf || pid<1 )
         goto out;
     if(*endp && !isspace(*endp))
         goto out;