archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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
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: