mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #69893

Browse Source
This commit is contained in:
Nikita Popov 2015-06-20 17:14:48 +02:00
parent 9589d26ef3
commit 5bf7a3aac7
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -26,6 +26,8 @@ PHP NEWS
(Nikita)
. Fixed bug #69892 (Different arrays compare indentical due to integer key
truncation). (Nikita)
. Fixed bug #69893 (Strict comparison between integer and empty string keys
crashes). (Nikita)
- DOM:
. Fixed bug #69846 (Segmenation fault (access violation) when iterating over

14
Zend/zend_hash.c
View File

@ -2248,20 +2248,24 @@ ZEND_API int zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t co
HASH_UNPROTECT_RECURSION(ht2);
return p1->h > p2->h ? 1 : -1;
}
} else { /* string indices */
size_t len0 = (p1->key ? p1->key->len : 0);
size_t len1 = (p2->key ? p2->key->len : 0);
if (len0 != len1) {
} else if (p1->key != NULL && p2->key != NULL) { /* string indices */
if (p1->key->len != p2->key->len) {
HASH_UNPROTECT_RECURSION(ht1);
HASH_UNPROTECT_RECURSION(ht2);
return len0 > len1 ? 1 : -1;
return p1->key->len > p2->key->len ? 1 : -1;
}
result = memcmp(p1->key->val, p2->key->val, p1->key->len);
if (result != 0) {
HASH_UNPROTECT_RECURSION(ht1);
HASH_UNPROTECT_RECURSION(ht2);
return result;
}
} else {
/* Mixed key types: A string key is considered as larger */
HASH_UNPROTECT_RECURSION(ht1);
HASH_UNPROTECT_RECURSION(ht2);
return p1->key != NULL ? 1 : -1;
}
pData2 = &p2->val;
} else {