com php-src: Fixed conversion to phpng mistakes: ext/filter/filter.c
| From: | Dmitry Stogov | Date: | Wed, 28 May 2014 19:04:50 +0000 |
| Subject: | com php-src: Fixed conversion to phpng mistakes: ext/filter/filter.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78622@lists.php.net to get a copy of this message | ||
Commit: 8334f386151965860448a6a8e2b9deb45d78692e
Author: Dmitry Stogov <dmitry@zend.com> Wed, 28 May 2014 23:04:50 +0400
Parents: 9e2bc83fdbaa37ccc2b38ec36b3d49a96376ba93
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8334f386151965860448a6a8e2b9deb45d78692e
Log:
Fixed conversion to phpng mistakes
Changed paths:
M ext/filter/filter.c
Diff:
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 20ecbaa..ae55443 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -667,11 +667,11 @@ static void php_filter_array_handler(zval *input, zval *op, zval
*return_value,
if (!op) {
zval_ptr_dtor(return_value);
- ZVAL_COPY(return_value, input);
+ ZVAL_DUP(return_value, input);
php_filter_call(return_value, FILTER_DEFAULT, NULL, 0, FILTER_REQUIRE_ARRAY TSRMLS_CC);
} else if (Z_TYPE_P(op) == IS_LONG) {
zval_ptr_dtor(return_value);
- ZVAL_COPY(return_value, input);
+ ZVAL_DUP(return_value, input);
php_filter_call(return_value, Z_LVAL_P(op), NULL, 0, FILTER_REQUIRE_ARRAY TSRMLS_CC);
} else if (Z_TYPE_P(op) == IS_ARRAY) {
array_init(return_value);