merge from mainline

2 files changed, 7 insertions, 3 deletions

diff --git a/src/lib/common.c b/src/lib/common.c
index fa988446b..d6dd43c4b 100644
--- a/src/lib/common.c
+++ b/src/lib/common.c
@@ -129,7 +129,7 @@ char *pid_proc_comm(const pid_t pid) {
         // open /proc/pid/cmdline file
         char *fname;
         int fd;
-        if (asprintf(&fname, "/proc/%d//comm", pid) == -1)
+        if (asprintf(&fname, "/proc/%d/comm", pid) == -1)
                 return NULL;
         if ((fd = open(fname, O_RDONLY)) < 0) {
                 free(fname);
@@ -154,6 +154,8 @@ char *pid_proc_comm(const pid_t pid) {
 
         // return a malloc copy of the command line
         char *rv = strdup(buffer);
+        if (!rv)
+                return NULL;
         if (strlen(rv) == 0) {
                 free(rv);
                 return NULL;
@@ -192,6 +194,8 @@ char *pid_proc_cmdline(const pid_t pid) {
 
         // return a malloc copy of the command line
         char *rv = strdup((char *) buffer);
+        if (!rv)
+                return NULL;
         if (strlen(rv) == 0) {
                 free(rv);
                 return NULL;
diff --git a/src/lib/pid.c b/src/lib/pid.c
index 3c804716d..75576c787 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -149,7 +149,7 @@ uid_t pid_get_uid(pid_t pid) {
         char buf[PIDS_BUFLEN];
         while (fgets(buf, PIDS_BUFLEN - 1, fp)) {
                 if (strncmp(buf, "Uid:", 4) == 0) {
-                        char *ptr = buf + 5;
+                        char *ptr = buf + 4;
                         while (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t')) {
                                 ptr++;
                         }
@@ -398,7 +398,7 @@ void pid_read(pid_t mon_pid) {
                                 pids[pid].parent = parent;
                         }
                         else if (strncmp(buf, "Uid:", 4) == 0) {
-                                char *ptr = buf + 5;
+                                char *ptr = buf + 4;
                                 while (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t')) {
                                         ptr++;
                                 }