com php-src: zend_hash_do_resize: fix compacting condition: Zend/zend_hash.c

From: Date: Tue, 23 Dec 2014 14:32:15 +0000
Subject: com php-src: zend_hash_do_resize: fix compacting condition: Zend/zend_hash.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83839@lists.php.net to get a copy of this message
Commit: c462ff7ac2514e22cef80aeb6fb733ebb22af8dc Author: K. <kaja47@seznam.cz> Tue, 23 Dec 2014 15:32:15 +0100 Parents: 60d491c97003154f3c2a66ff7997bef55c37ac80 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c462ff7ac2514e22cef80aeb6fb733ebb22af8dc Log: zend_hash_do_resize: fix compacting condition nNumUsed should always be greater or equal to nNumOfElements so original condition is never true and arrays are always doubled in size and compaction is never triggered Changed paths: M Zend/zend_hash.c Diff: diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index e9bbad8..0b034de 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -564,7 +564,7 @@ static void zend_hash_do_resize(HashTable *ht) IS_CONSISTENT(ht); - if (ht->nNumUsed < ht->nNumOfElements) { + if (ht->nNumUsed > ht->nNumOfElements) { HANDLE_BLOCK_INTERRUPTIONS(); zend_hash_rehash(ht); HANDLE_UNBLOCK_INTERRUPTIONS();

« previous php.cvs (#83839) next »