From: Andi Gutmans <andi@php.net>
Date: Thu, 9 Sep 2004 00:15:39 +0000 (+0000)
Subject: - Fix the fix.
X-Git-Tag: PRE_NEW_VM_GEN_PATCH~356
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f20f992ddde87e9e3d1211d28f418dcb7a772045;p=php

- Fix the fix.
---

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;
+							}
 						}
 					}