Fixed bug #43323 (Wrong count abstract methods). (Felipe, Dmitry)

diff --git a/NEWS b/NEWS
index e9e3d1ec8e7034d107a057f7115ca3d5affb8c2d..e2ba3d7b2c3d9db86b4108af8a8877962c6264e3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -106,6 +106,7 @@ PHP                                                                        NEWS
 - Fixed bug #43527 (DateTime created from a timestamp reports environment
   timezone). (Derick)
 - Fixed bug #43426 (crash on nested call_user_func() calls). (Dmitry)
+- Fixed bug #43323 (Wrong count abstract methods). (Felipe, Dmitry)
 - Fixed bug #43075 (Support 2007-11-01T24:00:00+00:00). (Derick)
 - Fixed bug #43003 (Invalid timezone reported for DateTime objects constructed
   using a timestamp). (Derick)

diff --git a/Zend/tests/bug43323.phpt b/Zend/tests/bug43323.phpt
new file mode 100644 (file)
index 0000000..d366a6d
--- /dev/null
+++ b/Zend/tests/bug43323.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #43323 (Wrong count abstract methods)
+--FILE--
+<?php
+abstract class bar {
+    abstract public function bar();
+}
+
+class foo extends bar {
+}
+--EXPECTF--
+Fatal error: Class foo contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (bar::bar) in %sbug43323.php on line 7

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 6f816b8cab001a3fbcabbe2fdb2877e1089a8096..b40901630a6dfe3ee179e7b2411b4f76cc7cb589 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1659,6 +1659,7 @@ check_fetch_type:
 typedef struct _zend_abstract_info {
        zend_function *afn[MAX_ABSTRACT_INFO_CNT + 1];
        int cnt;
+       int ctor;
 } zend_abstract_info;
 
 static int zend_verify_abstract_class_function(zend_function *fn, zend_abstract_info *ai TSRMLS_DC) /* {{{ */
@@ -1667,7 +1668,16 @@ static int zend_verify_abstract_class_function(zend_function *fn, zend_abstract_
                if (ai->cnt < MAX_ABSTRACT_INFO_CNT) {
                        ai->afn[ai->cnt] = fn;
                }
-               ai->cnt++;
+               if (fn->common.fn_flags & ZEND_ACC_CTOR) {
+                       if (!ai->ctor) {
+                               ai->cnt++;
+                               ai->ctor = 1;
+                       } else {
+                               ai->afn[ai->cnt] = NULL;
+                       }
+               } else {
+                       ai->cnt++;
+               }
        }
        return 0;
 }