com php-src: Fixed(attempt to) bug #72405 (mb_ereg_replac e - mbc_to_code (oniguruma) - oob read ac cess): NEWS ext/mbstring/php_mbregex.c

From: Date: Wed, 15 Jun 2016 06:54:57 +0000
Subject: com php-src: Fixed(attempt to) bug #72405 (mb_ereg_replac e - mbc_to_code (oniguruma) - oob read ac cess): NEWS ext/mbstring/php_mbregex.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92389@lists.php.net to get a copy of this message
Commit: 999a3553d58c537b4919821855b2cc8fb62b0b2f Author: Xinchen Hui <laruence@gmail.com> Wed, 15 Jun 2016 14:54:57 +0800 Parents: 3d5641872239cbd4ec8855b05c90f94fb0d11d7e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=999a3553d58c537b4919821855b2cc8fb62b0b2f Log: Fixed(attempt to) bug #72405 (mb_ereg_replace - mbc_to_code (oniguruma) - oob read access) according to ext/mbstring/oniguruma/enc/utf8.c, max bytes are 6 Bugs: https://bugs.php.net/72405 Changed paths: M NEWS M ext/mbstring/php_mbregex..c Diff: diff --git a/NEWS b/NEWS index 4a8d686..477be3d 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ PHP NEWS ?? ??? 2016 PHP 7.0.9 - Mbstring: + . Fixed bug #72405 (mb_ereg_replace - mbc_to_code (oniguruma) - + oob read access). (Laruence) . Fixed bug #72399 (Use-After-Free in MBString (search_re)). (Laruence) - Standard: diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index c1f9fc2..2337926 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -811,7 +811,7 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp OnigUChar *pos; OnigUChar *string_lim; char *description = NULL; - char pat_buf[4]; + char pat_buf[6]; const mbfl_encoding *enc; @@ -864,6 +864,8 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp pat_buf[1] = '\0'; pat_buf[2] = '\0'; pat_buf[3] = '\0'; + pat_buf[4] = '\0'; + pat_buf[5] = '\0'; arg_pattern = pat_buf; arg_pattern_len = 1;

« previous php.cvs (#92389) next »