summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2004-09-09 00:15:39 +0000
committerAndi Gutmans <andi@php.net>2004-09-09 00:15:39 +0000
commitf20f992ddde87e9e3d1211d28f418dcb7a772045 (patch)
treed3a2722f428c40ac6104c24ffa1067fabc9b46a0 /Zend/zend_API.c
parent2e286e73740faac64e695cc4e014f7a06905c980 (diff)
downloadphp-git-f20f992ddde87e9e3d1211d28f418dcb7a772045.tar.gz
- Fix the fix.
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r--Zend/zend_API.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index bd1450cff5..41ebc35d2e 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -316,12 +316,13 @@ static char *zend_parse_arg_impl(zval **arg, va_list *va, char **spec TSRMLS_DC)
*pl = Z_STRLEN_PP(arg);
break;
case IS_OBJECT: {
- if (Z_OBJ_HANDLER_PP(arg, cast_object)
- && Z_OBJ_HANDLER_PP(arg, cast_object)(*arg, *arg, IS_STRING, 0 TSRMLS_CC) == SUCCESS) {
+ if (Z_OBJ_HANDLER_PP(arg, cast_object)) {
SEPARATE_ZVAL_IF_NOT_REF(arg);
- *pl = Z_STRLEN_PP(arg);
- *p = Z_STRVAL_PP(arg);
- break;
+ if (Z_OBJ_HANDLER_PP(arg, cast_object)(*arg, *arg, IS_STRING, 0 TSRMLS_CC) == SUCCESS) {
+ *pl = Z_STRLEN_PP(arg);
+ *p = Z_STRVAL_PP(arg);
+ break;
+ }
}
}