]> granicus.if.org Git - php/commitdiff
- Fix the fix.
authorAndi Gutmans <andi@php.net>
Thu, 9 Sep 2004 00:15:39 +0000 (00:15 +0000)
committerAndi Gutmans <andi@php.net>
Thu, 9 Sep 2004 00:15:39 +0000 (00:15 +0000)
Zend/zend_API.c

index bd1450cff5ce51c7ca01598fa14c0c10798dc12d..41ebc35d2eb12ba65bd383eff0c51df4e3d499fb 100644 (file)
@@ -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;
+                                                       }
                                                }
                                        }