From: Andi Gutmans <andi@php.net>
Date: Sun, 10 Nov 2002 22:02:28 +0000 (+0000)
Subject: - MFZE1
X-Git-Tag: php-4.3.0RC1~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e19165b356cafabb545e578577c7242efe936f27;p=php

- MFZE1
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 52ed878eae..aa31534db4 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -930,8 +930,18 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
 				short_class_name_length = strlen(short_class_name);
 			}
 		}
-		
-		zend_hash_update(&CG(active_class_entry)->function_table, name, name_len+1, &op_array, sizeof(zend_op_array), (void **) &CG(active_op_array));
+		if (zend_hash_add(&CG(active_class_entry)->function_table, name, name_len+1, &op_array, sizeof(zend_op_array), (void **) &CG(active_op_array)) == FAILURE) {
+			zend_op_array *child_op_array, *parent_op_array;
+			if (CG(active_class_entry)->parent
+					&& (zend_hash_find(&CG(active_class_entry)->function_table, name, name_len+1, (void **) &child_op_array) == SUCCESS)
+					&& (zend_hash_find(&CG(active_class_entry)->parent->function_table, name, name_len+1, (void **) &parent_op_array) == SUCCESS)
+					&& (child_op_array == parent_op_array)) {
+				zend_hash_update(&CG(active_class_entry)->function_table, name, name_len+1, &op_array, sizeof(zend_op_array), (void **) &CG(active_op_array));
+			} else {
+				zend_error(E_COMPILE_ERROR, "Cannot redeclare %s()", name);
+			}
+		}
+
 		if ((short_class_name_length == name_len) && (!memcmp(short_class_name, name, name_len))) {
 			CG(active_class_entry)->constructor = (zend_function *) CG(active_op_array);
 		} else if ((function_name->u.constant.value.str.len == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) && (!memcmp(function_name->u.constant.value.str.val, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)))) {