From: Nikita Popov <nikic@php.net>
Date: Mon, 15 Sep 2014 21:04:34 +0000 (+0200)
Subject: Remove always-true comparisons
X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~85^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7bfd006bd40354ac598d820becaceb6331c60c9;p=php

Remove always-true comparisons
---

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 52ec43ba06..5354ce29f6 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -856,7 +856,7 @@ ZEND_API int zend_hash_index_del(HashTable *ht, zend_ulong h)
 	IS_CONSISTENT(ht);
 
 	if (ht->u.flags & HASH_FLAG_PACKED) {
-		if (h >=0 && h < ht->nNumUsed) {
+		if (h < ht->nNumUsed) {
 			p = ht->arData + h;
 			if (Z_TYPE(p->val) != IS_UNDEF) {
 				HANDLE_BLOCK_INTERRUPTIONS();
@@ -1455,7 +1455,7 @@ ZEND_API zval *zend_hash_index_find(const HashTable *ht, zend_ulong h)
 	IS_CONSISTENT(ht);
 
 	if (ht->u.flags & HASH_FLAG_PACKED) {
-		if (h >= 0 && h < ht->nNumUsed) {
+		if (h < ht->nNumUsed) {
 			p = ht->arData + h;
 			if (Z_TYPE(p->val) != IS_UNDEF) {
 				return &p->val;
@@ -1476,7 +1476,7 @@ ZEND_API zend_bool zend_hash_index_exists(const HashTable *ht, zend_ulong h)
 	IS_CONSISTENT(ht);
 
 	if (ht->u.flags & HASH_FLAG_PACKED) {
-		if (h >= 0 && h < ht->nNumUsed) {
+		if (h < ht->nNumUsed) {
 			if (Z_TYPE(ht->arData[h].val) != IS_UNDEF) {
 				return 1;
 			}