From: Marcus Boerger <helly@php.net>
Date: Wed, 29 Sep 2004 20:57:07 +0000 (+0000)
Subject: - MFB (synch correctly not only for one problem)
X-Git-Tag: PRE_NEW_VM_GEN_PATCH~127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa247a32762a69e563aa472769cf871860f50c7d;p=php

- MFB (synch correctly not only for one problem)
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index b987d2a5b9..0e1ea965d6 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -338,12 +338,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: {
-						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) {
-							*pl = Z_STRLEN_PP(arg);
-							*p = Z_STRVAL_PP(arg);
-							break;
+						if (Z_OBJ_HANDLER_PP(arg, cast_object)) {
+							SEPARATE_ZVAL_IF_NOT_REF(arg);
+							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;
+							}
 						}
 					}