php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-23 07:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix each() binary safety for keys

Browse Source
This commit is contained in:
Zeev Suraski
2003-07-24 13:06:25 +00:00
parent 0610515703
commit 2109ab3438
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/zend_builtin_functions.c
+3 -2
View File
@@ -352,6 +352,7 @@ ZEND_FUNCTION(each)
{
zval **array, *entry, **entry_ptr, *tmp;
char *string_key;
uint string_key_len;
ulong num_key;
zval **inserted_pointer;
HashTable *target_hash;
@@ -386,9 +387,9 @@ ZEND_FUNCTION(each)
entry->refcount++;
/* add the key elements */
switch (zend_hash_get_current_key(target_hash, &string_key, &num_key, 1)) {
switch (zend_hash_get_current_key_ex(target_hash, &string_key, &string_key_len, &num_key, 1, NULL)) {
case HASH_KEY_IS_STRING:
add_get_index_string(return_value, 0, string_key, (void **) &inserted_pointer, 0);
add_get_index_stringl(return_value, 0, string_key, string_key_len-1, (void **) &inserted_pointer, 0);
break;
case HASH_KEY_IS_LONG:
add_get_index_long(return_value, 0, num_key, (void **) &inserted_pointer);