com php-src: Fixed IS_INDRICT handling: ext/wddx/wddx .c
| From: | Xinchen Hui | Date: | Mon, 12 May 2014 02:52:37 +0000 |
| Subject: | com php-src: Fixed IS_INDRICT handling: ext/wddx/wddx .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78260@lists.php.net to get a copy of this message | ||
Commit: fca5af618fa4fe42079d6c2fdc9e1da25af6488b
Author: Xinchen Hui <laruence@php.net> Mon, 12 May 2014 10:52:37 +0800
Parents: 618d6e273c1badd69ee46267c21e0ae6e7b907c4
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fca5af618fa4fe42079d6c2fdc9e1da25af6488b
Log:
Fixed IS_INDRICT handling
Changed paths:
M ext/wddx/wddx.c
Diff:
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index ad55652..18fd70b 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -660,6 +660,9 @@ static void php_wddx_add_var(wddx_packet *packet, zval *name_var)
zend_rebuild_symbol_table(TSRMLS_C);
}
if ((val = zend_hash_find(&EG(active_symbol_table)->ht, Z_STR_P(name_var))) != NULL) {
+ if (Z_TYPE_P(val) == IS_INDIRECT) {
+ val = Z_INDIRECT_P(val);
+ }
php_wddx_serialize_var(packet, val, Z_STR_P(name_var) TSRMLS_CC);
}
} else if (Z_TYPE_P(name_var) == IS_ARRAY || Z_TYPE_P(name_var) == IS_OBJECT) {