diff options
| author | Xinchen Hui <laruence@php.net> | 2013-01-14 16:23:22 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-01-14 16:23:22 +0800 |
| commit | 62059c16ee2f2802caa00f2aad2fa44c867dd1f1 (patch) | |
| tree | d1950d57758469b4d555cce7d4e22fd34373b4c8 /Zend/zend_builtin_functions.c | |
| parent | fe27146b1b533e046e9a5841bb6e5685296208a8 (diff) | |
| download | php-git-62059c16ee2f2802caa00f2aad2fa44c867dd1f1.tar.gz | |
Fixed bug #63980 (object members get trimmed by zero bytes)
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 7bbb04785e..4d950a203b 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -987,7 +987,7 @@ ZEND_FUNCTION(get_object_vars) HashPosition pos; char *key; const char *prop_name, *class_name; - uint key_len; + uint key_len, prop_len; ulong num_index; zend_object *zobj; @@ -1014,10 +1014,10 @@ ZEND_FUNCTION(get_object_vars) while (zend_hash_get_current_data_ex(properties, (void **) &value, &pos) == SUCCESS) { if (zend_hash_get_current_key_ex(properties, &key, &key_len, &num_index, 0, &pos) == HASH_KEY_IS_STRING) { if (zend_check_property_access(zobj, key, key_len-1 TSRMLS_CC) == SUCCESS) { - zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name); + zend_unmangle_property_name_ex(key, key_len - 1, &class_name, &prop_name, &prop_len); /* Not separating references */ Z_ADDREF_PP(value); - add_assoc_zval_ex(return_value, prop_name, strlen(prop_name)+1, *value); + add_assoc_zval_ex(return_value, prop_name, prop_len + 1, *value); } } zend_hash_move_forward_ex(properties, &pos); |