com php-src: Prevented modification of constant arguments: Zend/zend_interfaces.c
| From: | Dmitry Stogov | Date: | Wed, 16 Apr 2014 17:31:32 +0000 |
| Subject: | com php-src: Prevented modification of constant arguments: Zend/zend_interfaces.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77368@lists.php.net to get a copy of this message | ||
Commit: 2d62a121289c248f3aa9adc1336f13e68ca8c1c6
Author: Dmitry Stogov <dmitry@zend.com> Wed, 16 Apr 2014 21:31:32 +0400
Parents: 05817f1a9393f225a3a4a690de4caf9b3458b3cc
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2d62a121289c248f3aa9adc1336f13e68ca8c1c6
Log:
Prevented modification of constant arguments
Changed paths:
M Zend/zend_interfaces.c
Diff:
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index 3e9d937..cf8889e 100644
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -110,10 +110,10 @@ ZEND_API zval* zend_call_method(zval *object, zend_class_entry *obj_ce,
zend_fun
}
}
/* copy arguments back, they might be changed by references */
- if (param_count > 0) {
+ if (param_count > 0 && Z_ISREF(params[0]) && !Z_ISREF_P(arg1)) {
ZVAL_COPY_VALUE(arg1, ¶ms[0]);
}
- if (param_count > 1) {
+ if (param_count > 1 && Z_ISREF(params[1]) && !Z_ISREF_P(arg2)) {
ZVAL_COPY_VALUE(arg2, ¶ms[1]);
}
if (!retval_ptr) {