diff --git a/NEWS b/NEWS index 42c54e587de16..894d23c2375ae 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 8.1.21 +- 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 index 7b00348be67cc..01a8d05c4c1e9 100644 --- a/sapi/cli/ps_title.c +++ b/sapi/cli/ps_title.c @@ -167,19 +167,20 @@ 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++) + for (i = 0; environ[i] != NULL; i++) { - if (end_of_area + 1 != environ[i]) - non_contiguous_area = 1; - end_of_area = environ[i] + strlen(environ[i]); + if (end_of_area + 1 == environ[i]) { + 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];