diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-04-15 11:05:03 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-04-15 11:05:03 +0800 |
| commit | a0690ff2881a3ed741c81cceec58ce716161e552 (patch) | |
| tree | 379a53683035b80ac793c9ec15601b5ccb5c9652 /Zend/zend_API.c | |
| parent | 2056359594cbaeeb38d13a73f54cfaba52b17475 (diff) | |
| download | php-git-a0690ff2881a3ed741c81cceec58ce716161e552.tar.gz | |
Fixed zend_object_get_t in simpleXML
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 1ce9f11b11..a748ec38d4 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -281,7 +281,8 @@ static int parse_arg_object_to_string(zval *arg, char **p, int *pl, int type TSR } if (!Z_OBJ_HANDLER_P(arg, cast_object) && Z_OBJ_HANDLER_P(arg, get)) { int use_copy; - zval *z = Z_OBJ_HANDLER_P(arg, get)(arg TSRMLS_CC); + zval rv; + zval *z = Z_OBJ_HANDLER_P(arg, get)(arg, &rv TSRMLS_CC); Z_ADDREF_P(z); if(Z_TYPE_P(z) != IS_OBJECT) { zval_dtor(arg); @@ -321,7 +322,8 @@ static int parse_arg_object_to_str(zval *arg, zend_string **str, int type TSRMLS } if (!Z_OBJ_HANDLER_P(arg, cast_object) && Z_OBJ_HANDLER_P(arg, get)) { int use_copy; - zval *z = Z_OBJ_HANDLER_P(arg, get)(arg TSRMLS_CC); + zval rv; + zval *z = Z_OBJ_HANDLER_P(arg, get)(arg, &rv TSRMLS_CC); Z_ADDREF_P(z); if(Z_TYPE_P(z) != IS_OBJECT) { zval_dtor(arg); |