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

Replace zend_ce_error with NULL and replace more E_ERROR with thrown Error

Browse source
This commit is contained in:
Aaron Piotrowski 2016-06-11 12:07:28 -05:00
parent e3c681aa5c
commit 771e5cc247
30 changed files with 101 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/mbstring/php_mbregex.c
View file

@ -28,7 +28,6 @@
#if HAVE_MBREGEX
#include "zend_exceptions.h"
#include "zend_smart_str.h"
#include "ext/standard/info.h"
#include "php_mbregex.h"
@ -950,7 +949,10 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp
if (zend_eval_stringl(ZSTR_VAL(eval_str), ZSTR_LEN(eval_str), &v, description) == FAILURE) {
efree(description);
zend_throw_error(NULL, "Failed evaluating code: %s%s", PHP_EOL, ZSTR_VAL(eval_str));
/* zend_error() does not return in this case */
onig_region_free(regs, 0);
smart_str_free(&out_buf);
smart_str_free(&eval_buf);
RETURN_FALSE;
}
/* result of eval */