From: Marcus Boerger <helly@php.net>
Date: Wed, 29 Sep 2004 20:24:35 +0000 (+0000)
Subject: - Refix the fix
X-Git-Tag: PRE_NEW_VM_GEN_PATCH~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ec6eb7aad7bcab3ce3f233f83ce34aa7685c390;p=php

- 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.*.
---

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;