com php-src: Fixed NULL pointer dereferencing: ext/mbstring/php _mbregex.c
| From: | Dmitry Stogov | Date: | Wed, 09 Apr 2014 07:56:48 +0000 |
| Subject: | com php-src: Fixed NULL pointer dereferencing: ext/mbstring/php _mbregex.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77466@lists.php.net to get a copy of this message | ||
Commit: 48d3b95aee6096aa5a005469ab20c64e6d316fdf
Author: Dmitry Stogov <dmitry@zend.com> Wed, 9 Apr 2014 11:56:48 +0400
Parents: 98ab24f1afe30608a9701b7f7ca0a24b5e5bd123
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=48d3b95aee6096aa5a005469ab20c64e6d316fdf
Log:
Fixed NULL pointer dereferencing
Changed paths:
M ext/mbstring/php_mbregex.c
Diff:
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index e9307df..9a82f10 100644
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -973,7 +973,9 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp
!ZVAL_IS_UNDEF(&retval)) {
convert_to_string_ex(&retval);
smart_str_appendl(&out_buf, Z_STRVAL(retval), Z_STRLEN(retval));
- eval_buf.s->len = 0;
+ if (eval_buf.s) {
+ eval_buf.s->len = 0;
+ }
zval_ptr_dtor(&retval);
} else {
efree(description);