Fix bug phpGH-11246 cli/get_set_process_title

lucasnetau · lucasnetau · commit 6e6b3b3922c5 · 2023-05-16T10:37:42.000+10:00
Fail to clobber_error only when the argv is a non-contiguous area
Don't increment the end_of_error if a non-contiguous area is encountered in environ
diff --git a/NEWS b/NEWS
@@ -10,6 +10,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-11222 (foreach by-ref may jump over keys during a rehash).
     (Bob)
 
+- CLI:
+  . Fixed bug GH-11246 (cli/get_set_process_title fails
+    on MacOS). (James Lucas)
+
 - Exif:
   . Fixed bug GH-10834 (exif_read_data() cannot read smaller stream wrapper
     chunk sizes). (nielsdos)
diff --git a/sapi/cli/ps_title.c b/sapi/cli/ps_title.c
@@ -167,19 +167,21 @@ char** save_ps_args(int argc, char** argv)
             end_of_area = argv[i] + strlen(argv[i]);
         }
 
+		if (non_contiguous_area != 0)
+			goto clobber_error;
+
         /*
          * check for contiguous environ strings following argv
          */
         for (i = 0; (non_contiguous_area == 0) && (environ[i] != NULL); i++)
         {
-            if (end_of_area + 1 != environ[i])
+            if (end_of_area + 1 != environ[i]) {
                 non_contiguous_area = 1;
-            end_of_area = environ[i] + strlen(environ[i]);
+            } else {
+            	end_of_area = environ[i] + strlen(environ[i]);
+            }
         }
 
-        if (non_contiguous_area != 0)
-            goto clobber_error;
-
         ps_buffer = argv[0];
         ps_buffer_size = end_of_area - argv[0];
 
