cvs: ZendEngine2 / zend_compile.c

derick Mon Mar 25 15:37:02 2002 EDT Modified files: /ZendEngine2 zend_compile.c Log: - MFZE1 Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.281 ZendEngine2/zend_compile.c:1.282 --- ZendEngine2/zend_compile.c:1.281 Mon Mar 18 15:27:03 2002 +++ ZendEngine2/zend_compile.c Mon Mar 25 15:37:02 2002 @@ -924,7 +924,9 @@ op_array.scope = CG(active_class_entry); if (is_method) { - 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_error(E_ERROR, "Cannot redeclare method %s()", name); + } if ((CG(active_class_entry)->name_length == (uint) name_len) && (!memcmp(CG(active_class_entry)->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)))) {