com php-src: Fixed NULL pointer dereference: ext/reflection/php _reflection.c
| From: | Dmitry Stogov | Date: | Mon, 17 Mar 2014 04:05:52 +0000 |
| Subject: | com php-src: Fixed NULL pointer dereference: ext/reflection/php _reflection.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77628@lists.php.net to get a copy of this message | ||
Commit: 466dbfee888a52d0bd4918321f072516e2065f0d
Author: Xinchen Hui <laruence@gmail.com> Mon, 17 Mar 2014 12:05:52 +0800
Parents: 639c4da20aa26f646d55b5a21f1a67ca7ef1dba1
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=466dbfee888a52d0bd4918321f072516e2065f0d
Log:
Fixed NULL pointer dereference
Changed paths:
M ext/reflection/php_reflection.c
Diff:
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 20d644d..c6fa805 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -2983,7 +2983,11 @@ ZEND_METHOD(reflection_method, invokeArgs)
fcc.function_handler = mptr;
fcc.calling_scope = obj_ce;
fcc.called_scope = intern->ce;
- ZVAL_COPY_VALUE(&fcc.object, object);
+ if (object) {
+ ZVAL_COPY_VALUE(&fcc.object, object);
+ } else {
+ ZVAL_UNDEF(&fcc.object);
+ }
/*
* Copy the zend_function when calling via handler (e.g. Closure::__invoke())