diff --git a/NEWS b/NEWS index acd0d6835df..94406e69f83 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ PHP 4 NEWS - Fixed bug #22154 (Possible crash when memory_limit is reached and output buffering in addition to session.use_trans_sid is used). (Ilia) - Fixed bug #24883 (variables_order and gpc_order being ignored). (Ilia) +- Fixed bug #24871 (methods misidentified as constructors). (Ilia) 30 Jul 2003, Version 4.3.3RC2 - Improved the NSAPI SAPI module (Uwe Schindler) diff --git a/ext/standard/aggregation.c b/ext/standard/aggregation.c index 69eb36ca48a..a2501682490 100644 --- a/ext/standard/aggregation.c +++ b/ext/standard/aggregation.c @@ -114,7 +114,7 @@ static void aggregate_methods(zend_class_entry *ce, zend_class_entry *from_ce, i /* We do not aggregate: * 1. constructors */ - if (!strncmp(func_name, from_ce->name, MIN(func_name_len-1, from_ce->name_length)) || + if (!strncmp(func_name, from_ce->name, MAX(func_name_len-1, from_ce->name_length)) || /* 2. private methods (heh, like we really have them) */ func_name[0] == '_' || /* 3. explicitly excluded methods */ diff --git a/ext/standard/tests/aggregation/bug24871.phpt b/ext/standard/tests/aggregation/bug24871.phpt new file mode 100644 index 00000000000..ec34fd38775 --- /dev/null +++ b/ext/standard/tests/aggregation/bug24871.phpt @@ -0,0 +1,18 @@ +--TEST-- +Bug #24871 (methods misidentified as constructors) +--FILE-- +bb(); +?> +--EXPECT-- +bool(true)