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

From: Date: Mon, 12 Oct 2026 16:43:23 +0000
Subject: [php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-142214@lists.php.net to get a copy of this message
Author: Weilin Du (LamentXU123) Date: 2026-10-13T00:06:21+08:00 Commit: https://github.com/php/php-src/commit/696ac1ab5d64d0c20632b923be71ddc8bb449454 Raw diff: https://github.com/php/php-src/commit/696ac1ab5d64d0c20632b923be71ddc8bb449454.diff Merge branch 'PHP-8.5' into PHP-8.6 * PHP-8.5: 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 334961f1b155..4987dab107a5 100644 --- a/NEWS +++ b/NEWS @@ -44,6 +44,10 @@ PHP NEWS . Fixed GH-24166 (Double-free in Phar::webPhar() in CGI without PATH_INFO). (RigelYoung, Jakub Zelenka) +- Readline: + . Fixed a crash in readline_info() when completion_append_character + contains a non-ASCII byte. (Weilin Du) + - Session: . Fixed session_write_close() keeping the save handler open when the session data cannot be encoded. (Ilia Alshanetsky) diff --git a/ext/readline/readline.c b/ext/readline/readline.c index d9ec274996c7..d43e96d0f590 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -246,7 +246,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 (#142214) next »