archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix segfault in php -a without readline

Browse source
This commit is contained in:
Nikita Popov 2021-05-11 11:39:04 +02:00
parent 8b8c8fd79c
commit 07061482a0
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sapi/cli/php_cli.c
View file

@ -874,11 +874,13 @@ static int do_cli(int argc, char **argv) /* {{{ */
#endif
if (interactive) {
#if (defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)) && !defined(COMPILE_DL_READLINE)
printf("Interactive shell\n\n");
#else
printf("Interactive mode enabled\n\n");
#endif
if (cli_shell_callbacks.cli_shell_run) {
printf("Interactive shell\n\n");
} else {
printf("Interactive mode enabled\n\n");
/* Treat as non-interactive apart from the stdin input */
interactive = false;
}
fflush(stdout);
}
@ -963,7 +965,7 @@ do_repeat:
cli_register_file_handles(/* no_close */ PHP_DEBUG || num_repeats > 1);
}
if (interactive && cli_shell_callbacks.cli_shell_run) {
if (interactive) {
EG(exit_status) = cli_shell_callbacks.cli_shell_run();
} else {
php_execute_script(&file_handle);