From 848c5c7695ee5655f3e38a74e3cf74aa762f9de9 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Wed, 10 May 2006 19:36:47 +0000 Subject: - Missing __tostring() conversion snippets --- Zend/zend_API.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Zend/zend_API.c') diff --git a/Zend/zend_API.c b/Zend/zend_API.c index e444090c74..c32cbdcd02 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -366,6 +366,17 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp *p = Z_STRVAL_PP(arg); break; } + zval_ptr_dtor(arg); + } + /* Standard PHP objects */ + if (Z_OBJ_HT_PP(arg) == &std_object_handlers || !Z_OBJ_HT_PP(arg)->cast_object) { + SEPARATE_ZVAL_IF_NOT_REF(arg); + if (zend_std_cast_object_tostring(*arg, *arg, IS_STRING TSRMLS_CC) == SUCCESS) { + *pl = Z_STRLEN_PP(arg); + *p = Z_STRVAL_PP(arg); + break; + } + zval_ptr_dtor(arg); } } -- cgit v1.2.1