1 files changed, 11 insertions, 31 deletions

diff --git a/src/lib/pid.c b/src/lib/pid.c
index 3cf0df909..5e9b20c94 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -74,8 +74,14 @@ void pid_get_cpu_time(unsigned pid, unsigned *utime, unsigned *stime) {
         if (fgets(line, PIDS_BUFLEN - 1, fp)) {
                 char *ptr = line;
                 // jump 13 fields
+
+                // end of comm string
+                ptr = strchr(ptr, ')');
+                if (ptr == NULL)
+                        goto myexit;
+
                 int i;
-                for (i = 0; i < 13; i++) {
+                for (i = 0; i < 11; i++) {
                         while (*ptr != ' ' && *ptr != '\t' && *ptr != '\0')
                                 ptr++;
                         if (*ptr == '\0')
@@ -273,36 +279,9 @@ void pid_print_list(unsigned index, int nowrap) {
         print_elem(index, nowrap);
 }
 
-// recursivity!!!
-void pid_store_cpu(unsigned index, unsigned parent, unsigned *utime, unsigned *stime) {
-        if (pids[index].level == 1) {
-                *utime = 0;
-                *stime = 0;
-        }
-
-        // Remove unused parameter warning
-        (void)parent;
-
-        unsigned utmp = 0;
-        unsigned stmp = 0;
-        pid_get_cpu_time(index, &utmp, &stmp);
-        *utime += utmp;
-        *stime += stmp;
-
-        unsigned i;
-        for (i = index + 1; i < (unsigned)max_pids; i++) {
-                if (pids[i].parent == (pid_t)index)
-                        pid_store_cpu(i, index, utime, stime);
-        }
-
-        if (pids[index].level == 1) {
-                pids[index].utime = *utime;
-                pids[index].stime = *stime;
-        }
-}
-
 // mon_pid: pid of sandbox to be monitored, 0 if all sandboxes are included
 void pid_read(pid_t mon_pid) {
+        unsigned old_max_pids = max_pids;
         FILE *fp = fopen("/proc/sys/kernel/pid_max", "r");
         if (fp) {
                 int val;
@@ -314,12 +293,13 @@ void pid_read(pid_t mon_pid) {
         }
 
         if (pids == NULL) {
+                old_max_pids = max_pids;
                 pids = malloc(sizeof(Process) * max_pids);
                 if (pids == NULL)
                         errExit("malloc");
         }
 
-        memset(pids, 0, sizeof(Process) * max_pids);
+        memset(pids, 0, sizeof(Process) * old_max_pids);
         pid_t mypid = getpid();
 
         DIR *dir;
@@ -424,7 +404,7 @@ void pid_read(pid_t mon_pid) {
         closedir(dir);
 
         // update max_pid
-        max_pids = new_max_pids;
+        max_pids = new_max_pids + 1;
 
         pid_t pid;
         for (pid = 0; pid < max_pids; pid++) {