Merge pull request #10975 from vespa-engine/balder/do-not-read-uninitialized-memory

Do not read past the end.

1 files changed, 1 insertions, 1 deletions

diff --git a/searchlib/src/vespa/searchlib/query/query.cpp b/searchlib/src/vespa/searchlib/query/query.cpp
index 82420c64e2b..5887ba395eb 100644
--- a/searchlib/src/vespa/searchlib/query/query.cpp
+++ b/searchlib/src/vespa/searchlib/query/query.cpp
@@ -177,7 +177,7 @@ SameElementQueryNode::evaluateHits(HitList & hl) const
         while ((nextIndex < nextIndexMax) && (nextHL[nextIndex].elemId() < currElemId)) {
             nextIndex++;
         }
-        if (nextHL[nextIndex].elemId() == currElemId) {
+        if ((nextIndex < nextIndexMax) && (nextHL[nextIndex].elemId() == currElemId)) {
             currMatchCount++;
             if ((currMatchCount+1) == numFields) {
                 Hit h = nextHL[indexVector[currMatchCount]];