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

More error conditions

Browse source
This commit is contained in:
Xinchen Hui 2015-03-21 16:54:45 +08:00
parent cda8e60638
commit 4180226117
3 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ext/pcre/php_pcre.c
View file

@ -1275,8 +1275,8 @@ static zend_string *php_replace_in_subject(zval *regex, zval *replace, zval *sub
*replace_value,
empty_replace;
zend_string *result;
zend_string *subject_str = zval_get_string(subject);
uint32_t replace_idx;
zend_string *subject_str = zval_get_string(subject);
/* FIXME: This might need to be changed to STR_EMPTY_ALLOC(). Check if this zval could be dtor()'ed somehow */
ZVAL_EMPTY_STRING(&empty_replace);
@ -1512,6 +1512,7 @@ static PHP_FUNCTION(preg_replace_callback_array)
ZEND_PARSE_PARAMETERS_END();
#endif
ZVAL_UNDEF(&zv);
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(pattern), num_idx, str_idx, replace) {
if (str_idx) {
ZVAL_STR_COPY(&regex, str_idx);
@ -1537,8 +1538,18 @@ static PHP_FUNCTION(preg_replace_callback_array)
zval_ptr_dtor(return_value);
}
ZVAL_COPY_VALUE(return_value, &zv);
zval_ptr_dtor(&regex);
if (Z_ISUNDEF(zv)) {
RETURN_NULL();
}
ZVAL_COPY_VALUE(return_value, &zv);
if (UNEXPECTED(EG(exception))) {
zval_dtor(return_value);
RETURN_NULL();
}
} ZEND_HASH_FOREACH_END();
if (zcount) {