Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: Fix bug GH-11246 cli/get_set_process_title
php · May 31, 2023 · 0bf8ecf · 0bf8ecf
2 parents c33589e + c6ae7a5
commit 0bf8ecf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/NEWS b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.2.8
 
+- CLI:
+  . Fixed bug GH-11246 (cli/get_set_process_title fails on MacOS).
+    (James Lucas)
+
 - Core:
   . Fixed build for the riscv64 architecture/GCC 12. (Daniil Gentili)
 

diff --git a/sapi/cli/ps_title.c b/sapi/cli/ps_title.c
@@ -169,19 +169,18 @@ char** save_ps_args(int argc, char** argv)
             end_of_area = argv[i] + strlen(argv[i]);
         }
 
+        if (!is_contiguous_area) {
+            goto clobber_error;
+        }
+
         /*
          * check for contiguous environ strings following argv
          */
-        for (i = 0; is_contiguous_area && (environ[i] != NULL); i++)
+        for (i = 0; environ[i] != NULL; i++)
         {
-            if (end_of_area + 1 != environ[i]) {
-                is_contiguous_area = false;
+            if (end_of_area + 1 == environ[i]) {
+                end_of_area = environ[i] + strlen(environ[i]);
             }
-            end_of_area = environ[i] + strlen(environ[i]);
-        }
-
-        if (!is_contiguous_area) {
-            goto clobber_error;
         }
 
         ps_buffer = argv[0];