[php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5

From: Date: Mon, 12 Oct 2026 16:43:24 +0000
Subject: [php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-142212@lists.php.net to get a copy of this message
Author: Weilin Du (LamentXU123) Date: 2026-10-13T00:05:42+08:00 Commit: https://github.com/php/php-src/commit/86cee669bf096f218df56f69648d6d41d1d5f57d Raw diff: https://github.com/php/php-src/commit/86cee669bf096f218df56f69648d6d41d1d5f57d.diff Merge branch 'PHP-8.4' into PHP-8.5 * PHP-8.4: ext/readline: Fix non-ASCII completion append characters in readline_info() (#24263) Changed paths: A ext/readline/tests/readline_info_completion_append_character.phpt M NEWS M ext/readline/readline.c Diff: diff --git a/NEWS b/NEWS index d893f2e33a42..3b68989cb1a5 100644 --- a/NEWS +++ b/NEWS @@ -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) + - Standard: . Fixed password_get_info() and password_needs_rehash() accepting malformed bcrypt costs. (Ilia Alshanetsky) diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 838c74da86ce..f9287af2eff6 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -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)); diff --git a/ext/readline/tests/readline_info_completion_append_character.phpt b/ext/readline/tests/readline_info_completion_append_character.phpt new file mode 100644 index 000000000000..88a0cf003388 --- /dev/null +++ b/ext/readline/tests/readline_info_completion_append_character.phpt @@ -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=

« previous php.cvs (#142212) next »