]> granicus.if.org Git - php/commitdiff
- MFB (synch correctly not only for one problem)
authorMarcus Boerger <helly@php.net>
Wed, 29 Sep 2004 20:57:07 +0000 (20:57 +0000)
committerMarcus Boerger <helly@php.net>
Wed, 29 Sep 2004 20:57:07 +0000 (20:57 +0000)
Zend/zend_API.c

index b987d2a5b9bb6ee5ff15968228eb4f62c04b3c97..0e1ea965d65ea95f42a3643ceb06fdfee56cf58e 100644 (file)
@@ -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;
+                                                       }
                                                }
                                        }