]> granicus.if.org Git - procps-ng/commitdiff
library: revert changes to 'look_up_our_self' function
authorJim Warner <james.warner@comcast.net>
Sun, 23 Aug 2015 05:00:00 +0000 (00:00 -0500)
committerCraig Small <csmall@enc.com.au>
Wed, 26 Aug 2015 12:42:02 +0000 (22:42 +1000)
The patch below is where most proc_t fixed size arrays
became simple pointers to char. In that commit changes
to the above function were made so that dynamic memory
was freed which included the program name (cmd) field.

That change was prompted by a valgrind reported memory
leak during development that no longer seems to exist.
However, by keeping the look_up_our_self() changes the
ps command without args then fails to report anything.

So this patch just restores the expected old behavior.

Reference(s):
commit 3881a0844afe4d1b3cd512b2c2fd79e11bb0ed06

Signed-off-by: Jim Warner <james.warner@comcast.net>
proc/readproc.c

index f0de56994ce3cfe4ca67671c823991776639e982..061dde1204377e9983b7fad8936365e1eb4c1a9e 100644 (file)
@@ -1426,9 +1426,7 @@ void look_up_our_self(proc_t *p) {
         fprintf(stderr, "Error, do this: mount -t proc proc /proc\n");
         _exit(47);
     }
-    memset(p, 0, sizeof(*p));
     stat2proc(ub.buf, p);  // parse /proc/self/stat
-    free_acquired(p, 0);
     free(ub.buf);
 }