Skip to content

Commit bb48f5d

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Fix bug GH-11246 cli/get_set_process_title
2 parents 6930ef5 + 0bf8ecf commit bb48f5d

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

sapi/cli/ps_title.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,19 +169,18 @@ char** save_ps_args(int argc, char** argv)
169169
end_of_area = argv[i] + strlen(argv[i]);
170170
}
171171

172+
if (!is_contiguous_area) {
173+
goto clobber_error;
174+
}
175+
172176
/*
173177
* check for contiguous environ strings following argv
174178
*/
175-
for (i = 0; is_contiguous_area && (environ[i] != NULL); i++)
179+
for (i = 0; environ[i] != NULL; i++)
176180
{
177-
if (end_of_area + 1 != environ[i]) {
178-
is_contiguous_area = false;
181+
if (end_of_area + 1 == environ[i]) {
182+
end_of_area = environ[i] + strlen(environ[i]);
179183
}
180-
end_of_area = environ[i] + strlen(environ[i]);
181-
}
182-
183-
if (!is_contiguous_area) {
184-
goto clobber_error;
185184
}
186185

187186
ps_buffer = argv[0];

0 commit comments

Comments
 (0)