clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source
This commit is contained in:
Xinchen Hui 2016-06-13 18:20:37 -07:00
commit 14e790a075
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/mbstring/php_mbregex.c
View File

@ -459,8 +459,12 @@ static php_mb_regex_t *php_mbregex_compile_pattern(const char *pattern, int patl
retval = NULL;
goto out;
}
if (rc == MBREX(search_re)) {
/* reuse the new rc? see bug #72399 */
MBREX(search_re) = NULL;
}
zend_hash_str_update_ptr(&MBREX(ht_rc), (char *)pattern, patlen, retval);
} else if (rc) {
} else {
retval = rc;
}
out:

10
ext/mbstring/tests/bug72399.phpt Normal file
View File

@ -0,0 +1,10 @@
--TEST--
Bug #72399 (Use-After-Free in MBString (search_re))
--FILE--
<?php
$var5 = mbereg_search_init("","2");
$var6 = mb_eregi_replace("2","","");
$var13 = mbereg_search_pos();
?>
--EXPECTF--
Warning: mbereg_search_pos(): No regex given in %sbug72399.php on line %d