diff options
| author | Antony Dovgal <tony2001@php.net> | 2008-03-17 14:54:42 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2008-03-17 14:54:42 +0000 |
| commit | 7dd943ac5cd5da1ab80c57fd4c822cb33f7c6c0f (patch) | |
| tree | 9ee7506de11c4690bd9008e50bed8d42b55d8b03 /Zend/zend_object_handlers.c | |
| parent | 964e0522a12b91051be334b47237983a7e7b61ad (diff) | |
| download | php-git-7dd943ac5cd5da1ab80c57fd4c822cb33f7c6c0f.tar.gz | |
MFH: fix #39127 (Old-style constructor fallbacks produce strange results)
Diffstat (limited to 'Zend/zend_object_handlers.c')
| -rw-r--r-- | Zend/zend_object_handlers.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 449c32408b..5ec5826d61 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -892,9 +892,17 @@ ZEND_API void zend_std_callstatic_user_call(INTERNAL_FUNCTION_PARAMETERS) /* {{{ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, char *function_name_strval, int function_name_strlen TSRMLS_DC) /* {{{ */ { - zend_function *fbc; + zend_function *fbc = NULL; + char *lc_class_name; - if (zend_hash_find(&ce->function_table, function_name_strval, function_name_strlen + 1, (void **) &fbc)==FAILURE) { + if (function_name_strlen == ce->name_length && ce->constructor) { + lc_class_name = zend_str_tolower_dup(ce->name, ce->name_length); + if (!memcmp(lc_class_name, function_name_strval, function_name_strlen)) { + fbc = ce->constructor; + } + efree(lc_class_name); + } + if (!fbc && zend_hash_find(&ce->function_table, function_name_strval, function_name_strlen+1, (void **) &fbc)==FAILURE) { if (ce->__call && EG(This) && Z_OBJ_HT_P(EG(This))->get_class_entry && |