Skip to content

Fix bug GH-11246 cli/get_set_process_title initialisation failure on MacOS #11247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix bug GH-11246 cli/get_set_process_title initialisation failure on MacOS #11247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e6b3b3
Fix bug GH-11246 cli/get_set_process_title
lucasnetau May 16, 2023
bc35595
Don't break early finding the end of the environ array
lucasnetau May 21, 2023
5d0163c
Remove unused non_contiguous_area variable
lucasnetau May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 7 additions & 7 deletions sapi/cli/ps_title.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,19 +167,19 @@ 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];

Expand Down