From: Dmitry Stogov <dmitry@php.net>
Date: Tue, 29 Jan 2008 11:13:52 +0000 (+0000)
Subject: Fixed bug #43323 (Wrong count abstract methods). (Felipe, Dmitry)
X-Git-Tag: RELEASE_2_0_0a1~723
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8ecba4872be9fc7ddfc099be4ec41e8ac2682d7;p=php

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

diff --git a/Zend/tests/bug43323.phpt b/Zend/tests/bug43323.phpt
new file mode 100644
index 0000000000..d366a6dd1f
--- /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 412875165d..a4a2183d76 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1877,6 +1877,7 @@ zend_class_entry *zend_fetch_class(char *class_name, uint class_name_len, int fe
 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) /* {{{ */
@@ -1885,7 +1886,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;
 }