Commit 961355c13dd for php.net

commit 961355c13dd315f4d898bb21273f2cf923e66880
Merge: f05b1563bab 0dd75c80edd
Author: David Carlier <devnexen@gmail.com>
Date:   Tue Apr 7 22:03:22 2026 +0100

    Merge branch 'PHP-8.5'

    * PHP-8.5:
      Fix GH-21664: iconv_mime_decode/iconv_mime_encode bailout corrupts EG(bailout).

diff --cc ext/iconv/iconv.c
index 02cffcb4b85,de1eb76ac52..914463ac03d
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@@ -1086,10 -1086,10 +1086,10 @@@ static php_iconv_err_t _php_iconv_mime_
  					if (char_cnt < ZSTR_LEN(encoded)) {
  						/* something went wrong! */
  						err = PHP_ICONV_ERR_UNKNOWN;
- 						goto out;
+ 						goto out_try;
  					}

 -					smart_str_appendl(pretval, ZSTR_VAL(encoded), ZSTR_LEN(encoded));
 +					smart_str_append(pretval, encoded);
  					char_cnt -= ZSTR_LEN(encoded);
  					smart_str_appendl(pretval, "?=", sizeof("?=") - 1);
  					char_cnt -= 2;