mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-18 01:33:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed memcmp() check with hash_quick_del (realKeyLength would be 0)

Browse Source
This commit is contained in:
Matt Wilmas 2008-05-30 11:05:35 +00:00
parent 3a9eea4a8d
commit aab8305c03
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zend/zend_hash.c
View File

@ -622,13 +622,11 @@ ZEND_API int zend_u_hash_del_key_or_index(HashTable *ht, zend_uchar type, zstr a
uint nIndex;
Bucket *p;
void *tmp = NULL;
uint realKeyLength = 0;
IS_CONSISTENT(ht);
if (flag == HASH_DEL_KEY) {
UNICODE_KEY(ht, type, arKey, nKeyLength, tmp);
realKeyLength = USTR_BYTES(type, nKeyLength);
h = zend_u_inline_hash_func(type, arKey, nKeyLength);
}
nIndex = h & ht->nTableMask;
@ -639,7 +637,7 @@ ZEND_API int zend_u_hash_del_key_or_index(HashTable *ht, zend_uchar type, zstr a
&& (p->nKeyLength == nKeyLength)
&& ((p->nKeyLength == 0) /* Numeric index (short circuits the memcmp()) */
|| ((p->key.type == type)
&& !memcmp(p->key.arKey.s, arKey.s, realKeyLength)))) {
&& !memcmp(p->key.arKey.s, arKey.s, USTR_BYTES(type, nKeyLength))))) {
HANDLE_BLOCK_INTERRUPTIONS();
if (p == ht->arBuckets[nIndex]) {
ht->arBuckets[nIndex] = p->pNext;