From 71ba442768e53a5940100f87044840d68dc4fda9 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Thu, 18 Sep 2003 11:50:05 +0000 Subject: Fallback to default behaviour for unsupported object type conversions --- Zend/zend.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Zend/zend.c') diff --git a/Zend/zend.c b/Zend/zend.c index f78c922742..407b76b915 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -227,11 +227,12 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop case IS_OBJECT: if (expr->value.obj.handlers->cast_object) { TSRMLS_FETCH(); - expr->value.obj.handlers->cast_object(expr, expr_copy, IS_STRING, 0 TSRMLS_CC); - } else { - expr_copy->value.str.val = (char *) emalloc(sizeof("Object id #")-1 + MAX_LENGTH_OF_LONG); - expr_copy->value.str.len = sprintf(expr_copy->value.str.val, "Object id #%ld", (long)expr->value.obj.handle); + if (expr->value.obj.handlers->cast_object(expr, expr_copy, IS_STRING, 0 TSRMLS_CC) == SUCCESS) { + break; + } } + expr_copy->value.str.val = (char *) emalloc(sizeof("Object id #")-1 + MAX_LENGTH_OF_LONG); + expr_copy->value.str.len = sprintf(expr_copy->value.str.val, "Object id #%ld", (long)expr->value.obj.handle); #if 0 /* FIXME: This might break BC for some people */ expr_copy->value.str.len = sizeof("Object")-1; -- cgit v1.2.1