diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-03-12 13:04:04 +0100 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2020-03-16 22:40:00 -0700 |
| commit | 1fdffd1c55d771ca22ae217784ab75fce592ad38 (patch) | |
| tree | 0ff18ba68dac3642fdeaa38946e9a172ceebb222 | |
| parent | 68e2da63622938396df91d617f496ebad5df3e4d (diff) | |
| download | php-git-1fdffd1c55d771ca22ae217784ab75fce592ad38.tar.gz | |
Fix #79371: mb_strtolower (UTF-32LE): stack-buffer-overflow
We make sure that negative values are properly compared.
| -rw-r--r-- | ext/mbstring/php_unicode.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/tests/bug79371.phpt | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ext/mbstring/php_unicode.c b/ext/mbstring/php_unicode.c index ac452b6a20..acb16bf06e 100644 --- a/ext/mbstring/php_unicode.c +++ b/ext/mbstring/php_unicode.c @@ -315,7 +315,7 @@ static int convert_case_filter(int c, void *void_data) /* Handle invalid characters early, as we assign special meaning to * codepoints above 0xffffff. */ - if (UNEXPECTED(c > 0xffffff)) { + if (UNEXPECTED((unsigned) c > 0xffffff)) { (*data->next_filter->filter_function)(c, data->next_filter); return 0; } diff --git a/ext/mbstring/tests/bug79371.phpt b/ext/mbstring/tests/bug79371.phpt new file mode 100644 index 0000000000..3014feba53 --- /dev/null +++ b/ext/mbstring/tests/bug79371.phpt @@ -0,0 +1,14 @@ +--TEST-- +Bug #79371 (mb_strtolower (UTF-32LE): stack-buffer-overflow) +--SKIPIF-- +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +?> +--FILE-- +<?php +$bytes = array(0xef, 0xbf, 0xbd, 0xef); +$str = implode(array_map("chr", $bytes)); +var_dump(bin2hex(mb_strtolower($str, "UTF-32LE"))); +?> +--EXPECT-- +string(8) "3f000000" |