From: Marcus Boerger <helly@php.net>
Date: Wed, 1 Mar 2006 16:18:35 +0000 (+0000)
Subject: - Must use return as in 5.1 after recursion
X-Git-Tag: RELEASE_1_2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9158218d3a76256de1adaffd185f1429631b8b20;p=php

- Must use return as in 5.1 after recursion
---

diff --git a/Zend/zend.c b/Zend/zend.c
index d3db13435f..e01263a5d3 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);