From 9158218d3a76256de1adaffd185f1429631b8b20 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Wed, 1 Mar 2006 16:18:35 +0000 Subject: [PATCH] - Must use return as in 5.1 after recursion --- Zend/zend.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index d3db13435fd..e01263a5d3e 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -365,9 +365,8 @@ ZEND_API void zend_make_string_zval(zval *expr, zval *expr_copy, int *use_copy) } else { ZVAL_ZVAL(expr_copy, z, 0, 1); *use_copy = 1; - return; } - break; + return; } } zend_error(EG(exception) ? E_ERROR : E_RECOVERABLE_ERROR, "Object of class %v could not be converted to string", Z_OBJCE_P(expr)->name); @@ -432,9 +431,8 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop } else { ZVAL_ZVAL(expr_copy, z, 0, 1); *use_copy = 1; - return; } - break; + return; } } zend_error(EG(exception) ? E_ERROR : E_RECOVERABLE_ERROR, "Object of class %v could not be converted to string", Z_OBJCE_P(expr)->name); @@ -482,9 +480,8 @@ ZEND_API void zend_make_unicode_zval(zval *expr, zval *expr_copy, int *use_copy) } else { ZVAL_ZVAL(expr_copy, z, 0, 1); *use_copy = 1; - return; } - break; + return; } } zend_error(EG(exception) ? E_ERROR : E_RECOVERABLE_ERROR, "Object of class %v could not be converted to string", Z_OBJCE_P(expr)->name);