diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2015-07-05 23:25:53 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2015-07-05 23:25:53 -0500 |
| commit | 7ec1e174645a549c19e4cf7d6930a4f1449c8f15 (patch) | |
| tree | d676d94379c8afbd8fef3b8c30a8c3749db0dc5b /ext/mbstring | |
| parent | 907476f34c0dbe34e311c4a99cc07eb40fd2954b (diff) | |
| download | php-git-7ec1e174645a549c19e4cf7d6930a4f1449c8f15.tar.gz | |
Update memory freeing and other issues, revert some changes
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 8f548fad4c..1423a6ffa6 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -946,7 +946,9 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp efree(description); zend_throw_error(zend_ce_error, "Failed evaluating code: %s%s", PHP_EOL, ZSTR_VAL(eval_buf.s)); onig_region_free(regs, 0); - RETVAL_EMPTY_STRING(); + smart_str_free(&out_buf); + smart_str_free(&eval_buf); + RETURN_FALSE; } /* result of eval */ |