From 2d34fe50460c2da7fb458846d04fa82aae8fc582 Mon Sep 17 00:00:00 2001 From: lacatoire Date: Mon, 16 Nov 2026 14:50:29 +0100 Subject: [PATCH 1/2] Fix iconv_mime_encode() overflowing on a negative line-length --- ext/iconv/iconv.c | 4 ++++ .../mime_encode_line_length_invalid.phpt | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 ext/iconv/tests/mime_encode_line_length_invalid.phpt diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 0212d1063c75..331fe6ca6834 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -2087,6 +2087,10 @@ PHP_FUNCTION(iconv_mime_encode) if ((pzval = zend_hash_str_find_deref(Z_ARRVAL_P(pref), "line-length", sizeof("line-length") - 1)) != NULL) { line_len = zval_get_long(pzval); + if (line_len <= 0) { + php_error_docref(NULL, E_WARNING, "The \"line-length\" option must be greater than 0"); + RETURN_FALSE; + } } if ((pzval = zend_hash_str_find_deref(Z_ARRVAL_P(pref), "line-break-chars", sizeof("line-break-chars") - 1)) != NULL) { diff --git a/ext/iconv/tests/mime_encode_line_length_invalid.phpt b/ext/iconv/tests/mime_encode_line_length_invalid.phpt new file mode 100644 index 000000000000..34096e4fc4de --- /dev/null +++ b/ext/iconv/tests/mime_encode_line_length_invalid.phpt @@ -0,0 +1,22 @@ +--TEST-- +iconv_mime_encode(): a non-positive line-length is rejected +--EXTENSIONS-- +iconv +--FILE-- + "UTF-8", "output-charset" => "UTF-8"]; +foreach ([-1, 0, PHP_INT_MIN] as $len) { + var_dump(iconv_mime_encode("S", "héllo", $o + ["line-length" => $len])); +} +var_dump(iconv_mime_encode("S", "héllo", $o + ["line-length" => 76])); +?> +--EXPECTF-- +Warning: iconv_mime_encode(): The "line-length" option must be greater than 0 in %s on line %d +bool(false) + +Warning: iconv_mime_encode(): The "line-length" option must be greater than 0 in %s on line %d +bool(false) + +Warning: iconv_mime_encode(): The "line-length" option must be greater than 0 in %s on line %d +bool(false) +string(%d) "S: =?UTF-8?B?%s?=" From 9ce4922c1297ad68a5657b85ea5e84aeb9086db1 Mon Sep 17 00:00:00 2001 From: lacatoire Date: Mon, 16 Nov 2026 20:11:21 +0100 Subject: [PATCH 2/2] Clamp a negative line-length to 0 instead of adding a new warning --- ext/iconv/iconv.c | 5 ++--- ext/iconv/tests/mime_encode_line_length_invalid.phpt | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 331fe6ca6834..ca782de79a31 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -2087,9 +2087,8 @@ PHP_FUNCTION(iconv_mime_encode) if ((pzval = zend_hash_str_find_deref(Z_ARRVAL_P(pref), "line-length", sizeof("line-length") - 1)) != NULL) { line_len = zval_get_long(pzval); - if (line_len <= 0) { - php_error_docref(NULL, E_WARNING, "The \"line-length\" option must be greater than 0"); - RETURN_FALSE; + if (line_len < 0) { + line_len = 0; } } diff --git a/ext/iconv/tests/mime_encode_line_length_invalid.phpt b/ext/iconv/tests/mime_encode_line_length_invalid.phpt index 34096e4fc4de..76803bf471e1 100644 --- a/ext/iconv/tests/mime_encode_line_length_invalid.phpt +++ b/ext/iconv/tests/mime_encode_line_length_invalid.phpt @@ -1,5 +1,5 @@ --TEST-- -iconv_mime_encode(): a non-positive line-length is rejected +iconv_mime_encode(): a negative line-length behaves like 0 --EXTENSIONS-- iconv --FILE-- @@ -11,12 +11,12 @@ foreach ([-1, 0, PHP_INT_MIN] as $len) { var_dump(iconv_mime_encode("S", "héllo", $o + ["line-length" => 76])); ?> --EXPECTF-- -Warning: iconv_mime_encode(): The "line-length" option must be greater than 0 in %s on line %d +Warning: iconv_mime_encode(): Buffer length exceeded in %s on line %d bool(false) -Warning: iconv_mime_encode(): The "line-length" option must be greater than 0 in %s on line %d +Warning: iconv_mime_encode(): Buffer length exceeded in %s on line %d bool(false) -Warning: iconv_mime_encode(): The "line-length" option must be greater than 0 in %s on line %d +Warning: iconv_mime_encode(): Buffer length exceeded in %s on line %d bool(false) string(%d) "S: =?UTF-8?B?%s?="