php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-28 18:22:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1'

Browse Source 
* PHP-7.1:
  Fixed bug #73532 (Null pointer dereference in mb_eregi)
This commit is contained in:
Xinchen Hui
2016-11-16 15:05:22 +08:00
parent 41983a1716 229024c725
commit 3a8a99e662
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/mbstring/php_mbregex.c
View File

@@ -708,8 +708,10 @@ static void _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAMETERS, int icase)
string_len,
_php_mb_regex_mbctype2name(MBREX(current_mbctype))
)) {
zval_dtor(array);
array_init(array);
if (array != NULL) {
zval_dtor(array);
array_init(array);
}
RETURN_FALSE;
}

8
ext/mbstring/tests/bug73532.phpt Normal file
View File

@@ -0,0 +1,8 @@
--TEST--
Bug #73532 (Null pointer dereference in mb_eregi)
--FILE--
<?php
var_dump(mb_eregi("a", "\xf5"));
?>
--EXPECTF--
bool(false)