Skip to content

ext/readline: Fix non-ASCII completion append characters in readline_info() #24263

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
LamentXU123 wants to merge 1 commit into from
Closed

ext/readline: Fix non-ASCII completion append characters in readline_info() #24263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -44,6 +44,10 @@ PHP NEWS
- Phpdbg:
. Fix wrong command names. (ndossche, Weilin Du)

- Readline:
. Fixed a crash in readline_info() when completion_append_character
contains a non-ASCII byte. (Weilin Du)

- SOAP:
. Fixed use of uninitialized func in do_request() on OOM bailout.
(David Carlier)
Expand Down
2 changes: 1 addition & 1 deletion ext/readline/readline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ PHP_FUNCTION(readline_info)
if (!try_convert_to_string(value)) {
RETURN_THROWS();
}
rl_completion_append_character = (int)Z_STRVAL_P(value)[0];
rl_completion_append_character = (unsigned char)Z_STRVAL_P(value)[0];
}
RETVAL_INTERNED_STR(
oldval == 0 ? ZSTR_EMPTY_ALLOC() : ZSTR_CHAR(oldval));
Expand Down
27 changes: 27 additions & 0 deletions ext/readline/tests/readline_info_completion_append_character.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--TEST--
readline_info(): completion_append_character supports non-ASCII bytes
--EXTENSIONS--
readline
--SKIPIF--
<?php
if (READLINE_LIB !== 'readline') die('skip readline only');
?>
--FILE--
<?php
readline_info('completion_append_character', '');
foreach (["\x7f", "\x80", "\xfftail", ''] as $value) {
$old = readline_info('completion_append_character', $value);
$current = readline_info('completion_append_character');
$info = readline_info();
printf("old=%s current=%s info=%s\n",
bin2hex($old),
bin2hex($current),
bin2hex($info['completion_append_character'])
);
}
?>
--EXPECT--
old= current=7f info=7f
old=7f current=80 info=80
old=80 current=ff info=ff
old=ff current= info=
Loading