From a1fb3971f222afa01583e41f4d8f0e037d2c7892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Tue, 15 Feb 2022 14:23:31 +0100
Subject: [PATCH] QHash: fix off-by-one in assertions

Coverity-Id: 378365
Coverity-Id: 378366
Coverity-Id: 378399
Coverity-Id: 378427
Coverity-Id: 378468
Coverity-Id: 378472
Pick-to: 6.3 6.2
Change-Id: Ib1efeacb59030b9d004320e56f560367f564d207
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/tools/qhash.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h
index a19713b337..0eb91e7604 100644
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
@@ -313,7 +313,7 @@ struct Span {
     }
     Node *insert(size_t i)
     {
-        Q_ASSERT(i <= SpanConstants::NEntries);
+        Q_ASSERT(i < SpanConstants::NEntries);
         Q_ASSERT(offsets[i] == SpanConstants::UnusedEntry);
         if (nextFree == allocated)
             addStorage();
@@ -325,7 +325,7 @@ struct Span {
     }
     void erase(size_t bucket) noexcept(std::is_nothrow_destructible<Node>::value)
     {
-        Q_ASSERT(bucket <= SpanConstants::NEntries);
+        Q_ASSERT(bucket < SpanConstants::NEntries);
         Q_ASSERT(offsets[bucket] != SpanConstants::UnusedEntry);
 
         unsigned char entry = offsets[bucket];
@@ -345,14 +345,14 @@ struct Span {
     }
     Node &at(size_t i) noexcept
     {
-        Q_ASSERT(i <= SpanConstants::NEntries);
+        Q_ASSERT(i < SpanConstants::NEntries);
         Q_ASSERT(offsets[i] != SpanConstants::UnusedEntry);
 
         return entries[offsets[i]].node();
     }
     const Node &at(size_t i) const noexcept
     {
-        Q_ASSERT(i <= SpanConstants::NEntries);
+        Q_ASSERT(i < SpanConstants::NEntries);
         Q_ASSERT(offsets[i] != SpanConstants::UnusedEntry);
 
         return entries[offsets[i]].node();
@@ -378,9 +378,9 @@ struct Span {
     }
     void moveFromSpan(Span &fromSpan, size_t fromIndex, size_t to) noexcept(std::is_nothrow_move_constructible_v<Node>)
     {
-        Q_ASSERT(to <= SpanConstants::NEntries);
+        Q_ASSERT(to < SpanConstants::NEntries);
         Q_ASSERT(offsets[to] == SpanConstants::UnusedEntry);
-        Q_ASSERT(fromIndex <= SpanConstants::NEntries);
+        Q_ASSERT(fromIndex < SpanConstants::NEntries);
         Q_ASSERT(fromSpan.offsets[fromIndex] != SpanConstants::UnusedEntry);
         if (nextFree == allocated)
             addStorage();