From 7ec1e174645a549c19e4cf7d6930a4f1449c8f15 Mon Sep 17 00:00:00 2001
From: Aaron Piotrowski <aaron@trowski.com>
Date: Sun, 5 Jul 2015 23:25:53 -0500
Subject: Update memory freeing and other issues, revert some changes

---
 ext/mbstring/php_mbregex.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ext/mbstring')

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 */
-- 
cgit v1.2.1