helly Sat Aug 14 15:04:01 2004 EDT
Modified files: (Branch: PHP_5_0)
/ZendEngine2 zend_compile.c
Log:
MFH: Add missing check
http://cvs.php.net/diff.php/ZendEngine2/zend_compile.c?r1=1.567.2.2&r2=1.567.2.3&ty=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.567.2.2
ZendEngine2/zend_compile.c:1.567.2.3
--- ZendEngine2/zend_compile.c:1.567.2.2 Mon Aug 2 18:43:16 2004
+++ ZendEngine2/zend_compile.c Sat Aug 14 15:04:01 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.567.2.2 2004/08/02 22:43:16 helly Exp $ */
+/* $Id: zend_compile.c,v 1.567.2.3 2004/08/14 19:04:01 helly Exp $ */
#include "zend_language_parser.h"
#include "zend.h"
@@ -2010,6 +2010,11 @@
zend_hash_merge(&ce->constants_table, &parent_ce->constants_table,
(void (*)(void *)) zval_add_ref, NULL, sizeof(zval *), 0);
zend_hash_merge_ex(&ce->function_table, &parent_ce->function_table,
(copy_ctor_func_t) do_inherit_method, sizeof(zend_function),
(merge_checker_func_t) do_inherit_method_check, ce);
do_inherit_parent_constructor(ce);
+
+ if ((ce->ce_flags & ZEND_ACC_IMPLICIT_ABSTRACT_CLASS) && !(ce->ce_flags
& ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))
+ {
+ zend_verify_abstract_class(ce TSRMLS_CC);
+ }
}
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|