From: Xinchen Hui <laruence@php.net>
Date: Thu, 23 Aug 2012 08:06:17 +0000 (+0800)
Subject: Refix #62358, previous has side-affect
X-Git-Tag: php-5.4.7RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d39aa984ad3ef79a8fc3db0cf8dc525a0738a7bc;p=php

Refix #62358, previous has side-affect
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 21e5ca2f6b..4ef4b97d6d 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3786,6 +3786,7 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
 		}
 
 		fn->common.scope = ce;
+		fn->common.prototype = prototype;
 
 		if (prototype
 			&& (prototype->common.fn_flags & ZEND_ACC_IMPLEMENTED_ABSTRACT
@@ -3803,11 +3804,11 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
 
 		/* one more thing: make sure we properly implement an abstract method */
 		if (existing_fn && existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
+            prototype = fn->common.prototype;
 			do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC);
+            fn->common.prototype = prototype;
 		}
 
-		fn->common.prototype = prototype;
-
 		/* delete inherited fn if the function to be added is not abstract */
 		if (existing_fn
 			&& existing_fn->common.scope != ce