clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix usage of uninitialized value and unicode support

Browse Source
This commit is contained in:
Dmitry Stogov 2006-07-27 09:19:26 +00:00
parent 95f2db2459
commit c62b08650b
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/reflection/php_reflection.c
View File

@ -2645,8 +2645,8 @@ ZEND_METHOD(reflection_class, getStaticProperties)
{
reflection_object *intern;
zend_class_entry *ce;
HashPosition pos;
zval **value;
HashPosition pos;
zval **value;
METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0);
GET_REFLECTION_OBJECT_PTR(ce);
@ -2663,13 +2663,14 @@ ZEND_METHOD(reflection_class, getStaticProperties)
if (zend_hash_get_current_key_ex(CE_STATIC_MEMBERS(ce), &key, &key_len, &num_index, 0, &pos) != FAILURE) {
zstr prop_name, class_name;
int prop_name_len = UG(unicode) ? u_strlen(prop_name.u) : strlen(prop_name.s);
int prop_name_len;
zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING, key, key_len-1, &class_name, &prop_name);
prop_name_len = UG(unicode) ? u_strlen(prop_name.u) : strlen(prop_name.s);
zval_add_ref(value);
zend_u_hash_update(Z_ARRVAL_P(return_value), UG(unicode)?IS_UNICODE:IS_STRING, prop_name, prop_name_len, value, sizeof(zval *), NULL);
zend_u_hash_update(Z_ARRVAL_P(return_value), UG(unicode)?IS_UNICODE:IS_STRING, prop_name, prop_name_len+1, value, sizeof(zval *), NULL);
}
zend_hash_move_forward_ex(CE_STATIC_MEMBERS(ce), &pos);
}

16
ext/reflection/tests/bug38132.phpt
View File

@ -32,3 +32,19 @@ array(2) {
bool(false)
bool(false)
bool(true)
--UEXPECT--
array(2) {
[u"bar"]=>
unicode(3) "baz"
[u"a"]=>
unicode(1) "a"
}
array(2) {
[0]=>
unicode(3) "bar"
[1]=>
unicode(1) "a"
}
bool(false)
bool(false)
bool(true)