archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- WS

Browse source
This commit is contained in:
Marcus Boerger 2006-05-27 19:04:16 +00:00
parent 341ffb3f3d
commit f93bf1007a
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_API.c
View file

@ -3028,7 +3028,7 @@ ZEND_API int zend_u_declare_property_ex(zend_class_entry *ce, zend_uchar type, z
property_info.doc_comment = doc_comment;
property_info.doc_comment_len = doc_comment_len;
property_info.ce = ce;
zend_u_hash_update(&ce->properties_info, type, name, name_length + 1, &property_info, sizeof(zend_property_info), NULL);

1
Zend/zend_compile.c
View file

@ -3318,6 +3318,7 @@ static int zend_constant_ct_subst(znode *result, zval *const_name TSRMLS_DC)
return 0;
}
void zend_do_fetch_constant(znode *result, znode *constant_container, znode *constant_name, int mode TSRMLS_DC)
{
switch (mode) {

4
Zend/zend_object_handlers.c
View file

@ -221,7 +221,7 @@ ZEND_API struct _zend_property_info *zend_get_property_info(zend_class_entry *ce
if (EG(scope) != ce
&& is_derived_class(ce, EG(scope))
&& EG(scope)
&& zend_u_hash_quick_find(&EG(scope)->properties_info, Z_TYPE_P(member), Z_UNIVAL_P(member), Z_UNILEN_P(member)+1, h, (void **) &scope_property_info)==SUCCESS
&& zend_u_hash_quick_find(&EG(scope)->properties_info, Z_TYPE_P(member), Z_UNIVAL_P(member), Z_UNILEN_P(member)+1, h, (void **) &scope_property_info)==SUCCESS
&& scope_property_info->flags & ZEND_ACC_PRIVATE) {
return scope_property_info;
} else if (property_info) {
@ -239,7 +239,7 @@ ZEND_API struct _zend_property_info *zend_get_property_info(zend_class_entry *ce
EG(std_property_info).name = Z_UNIVAL_P(member);
EG(std_property_info).name_length = Z_UNILEN_P(member);
EG(std_property_info).h = h;
EG(std_property_info).ce = ce;;
EG(std_property_info).ce = ce;
property_info = &EG(std_property_info);
}
return property_info;