summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2004-09-29 20:24:35 +0000
committerMarcus Boerger <helly@php.net>2004-09-29 20:24:35 +0000
commit0ec6eb7aad7bcab3ce3f233f83ce34aa7685c390 (patch)
treee7b930f35d4c37943d06aa51e85855ae35aed203 /Zend/zend_API.c
parent35e78f43a12be5adac77c6ce7d2395be3f2ef5ae (diff)
downloadphp-git-0ec6eb7aad7bcab3ce3f233f83ce34aa7685c390.tar.gz
- Refix the fix
# This somehow got lost and was then readded by Andi in 1.258 at the wrong # position. Obviously we need to separate the argument first and convert it # afterwards as done in 5.0.*.
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r--Zend/zend_API.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index e9925bd1ac..b987d2a5b9 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -338,9 +338,9 @@ static char *zend_parse_arg_impl(zval **arg, va_list *va, char **spec TSRMLS_DC)
*pl = Z_STRLEN_PP(arg);
break;
case IS_OBJECT: {
+ SEPARATE_ZVAL_IF_NOT_REF(arg);
if (Z_OBJ_HANDLER_PP(arg, cast_object)
&& Z_OBJ_HANDLER_PP(arg, cast_object)(*arg, *arg, IS_STRING, 0 TSRMLS_CC) == SUCCESS) {
- SEPARATE_ZVAL_IF_NOT_REF(arg);
*pl = Z_STRLEN_PP(arg);
*p = Z_STRVAL_PP(arg);
break;