php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  Fix bug GH-11246 cli/get_set_process_title
This commit is contained in:
Ilija Tovilo
2023-05-31 17:10:44 +02:00
parent 6930ef5837 0bf8ecf9b3
commit bb48f5da1e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sapi/cli/ps_title.c
View File

@@ -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];