php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 01:18:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

change namespaced ctors - only __construct would work

Browse Source
This commit is contained in:
Stanislav Malyshev
2010-04-04 23:28:20 +00:00
parent 462580cd7d
commit 5f11cd5693
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+3
View File
@@ -8,6 +8,9 @@ PHP NEWS
mcrypt_filter). (Stas)
- Added full_special_chars filter to ext/filter (Rasmus)
- Changed namespaced classes so that the ctor can only be named
__construct now. (Stas)
- Fixed a NULL pointer dereference when processing invalid XML-RPC
requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
Zend/tests/ns_063.phpt
+2 -1
View File
@@ -1,5 +1,5 @@
--TEST--
063: Support for old-style constructors in namesapces
063: Old-style constructors in namesapces (not supported!)
--FILE--
<?php
namespace Foo;
@@ -9,5 +9,6 @@ class Bar {
}
}
new Bar();
echo "ok\n";
--EXPECT--
ok
Zend/zend_compile.c
+6 -15
View File
@@ -1270,22 +1270,13 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
}
}
} else {
char *short_class_name;
int short_class_name_length;
char *short_class_lcname;
if ((short_class_name = zend_memrchr(CG(active_class_entry)->name, '\\', CG(active_class_entry)->name_length))) {
short_class_name_length = CG(active_class_entry)->name_length - (short_class_name - CG(active_class_entry)->name) - 1;
++short_class_name;
} else {
short_class_name = CG(active_class_entry)->name;
short_class_name_length = CG(active_class_entry)->name_length;
}
short_class_lcname = do_alloca(short_class_name_length + 1, use_heap);
zend_str_tolower_copy(short_class_lcname, short_class_name, short_class_name_length);
char *class_lcname;
class_lcname = do_alloca(CG(active_class_entry)->name_length + 1, use_heap);
zend_str_tolower_copy(class_lcname, CG(active_class_entry)->name, CG(active_class_entry)->name_length);
/* Improve after RC: cache the lowercase class name */
if ((short_class_name_length == name_len) && (!memcmp(short_class_lcname, lcname, name_len))) {
if ((CG(active_class_entry)->name_length == name_len) && (!memcmp(class_lcname, lcname, name_len))) {
if (CG(active_class_entry)->constructor) {
zend_error(E_STRICT, "Redefining already defined constructor for class %s", CG(active_class_entry)->name);
} else {
@@ -1338,7 +1329,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
} else if (!(fn_flags & ZEND_ACC_STATIC)) {
CG(active_op_array)->fn_flags |= ZEND_ACC_ALLOW_STATIC;
}
free_alloca(short_class_lcname, use_heap);
free_alloca(class_lcname, use_heap);
}
efree(lcname);