- 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 e9925bd1ac183e9cf772cfe4cf8a99ee029e5f58..b987d2a5b9bb6ee5ff15968228eb4f62c04b3c97 100644 (file)
--- 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;