From: Jan Rybar <jrybar@redhat.com>
Date: Wed, 29 Apr 2020 15:26:51 +0000 (+0200)
Subject: pstree: consecutive NULs in cmdline args wrongly parsed
X-Git-Tag: v23.4rc1~15^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c028ba11f90beecbd48d9a9f9ae8151622ea5fbc;p=psmisc

pstree: consecutive NULs in cmdline args wrongly parsed
---

diff --git a/src/pstree.c b/src/pstree.c
index da02564..44e932c 100644
--- a/src/pstree.c
+++ b/src/pstree.c
@@ -571,8 +571,12 @@ static void set_args(PROC * this, const char *args, int size)
     }
     this->argc = 0;
     for (i = 0; i < size - 1; i++)
-        if (!args[i])
+        if (!args[i]) {
             this->argc++;
+            /* now skip consecutive NUL */
+            while(!args[i] && (i < size -1 ))
+                i++;
+        }
     if (!this->argc)
         return;
     if (!(this->argv = malloc(sizeof(char *) * this->argc))) {