Eliminate "h < ht->nNumUsed" check in zend_hash_next_index_insert_new()

dstogov · dstogov · commit 6729276684ea · 2021-08-12T02:29:24.000+03:00
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
@@ -999,7 +999,8 @@ static zend_always_inline zval *_zend_hash_index_add_or_update_i(HashTable *ht,
 	}
 
 	if (HT_FLAGS(ht) & HASH_FLAG_PACKED) {
-		if (h < ht->nNumUsed) {
+		if ((flag & (HASH_ADD_NEW|HASH_ADD_NEXT)) != (HASH_ADD_NEW|HASH_ADD_NEXT)
+		 && h < ht->nNumUsed) {
 			p = ht->arData + h;
 			if (Z_TYPE(p->val) != IS_UNDEF) {
 				if (flag & HASH_LOOKUP) {

Original file line number	Diff line number	Diff line change
`@@ -999,7 +999,8 @@ static zend_always_inline zval _zend_hash_index_add_or_update_i(HashTable ht,`
`999`	`999`	`}`
`1000`	`1000`
`1001`	`1001`	`if (HT_FLAGS(ht) & HASH_FLAG_PACKED) {`
`1002`		`- if (h < ht->nNumUsed) {`
	`1002`	`+ if ((flag & (HASH_ADD_NEW\|HASH_ADD_NEXT)) != (HASH_ADD_NEW\|HASH_ADD_NEXT)`
	`1003`	`+ && h < ht->nNumUsed) {`
`1003`	`1004`	`p = ht->arData + h;`
`1004`	`1005`	`if (Z_TYPE(p->val) != IS_UNDEF) {`
`1005`	`1006`	`if (flag & HASH_LOOKUP) {`