Merge pull request #77 from Siveya/5.0

Fix the infinite loop when searching for something that cannot be found
Dax89 · Dec 25, 2023 · 06136db · 06136db
2 parents c854dac + 805f492
commit 06136db
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/model/qhexutils.cpp b/model/qhexutils.cpp
@@ -117,14 +117,20 @@ qint64 findIter(qint64 startoffset, QHexFindDirection fd, const QHexView* hexvie
 
     qint64 i = startoffset;
 
+    bool restartLoopOnce = true;
+
     while(offset == -1 && (cfd == QHexFindDirection::Backward ? (i >= 0) : (i < hexdocument->length())))
     {
         if(!f(i, offset)) break;
 
         if(cfd == QHexFindDirection::Backward) i--;
         else i++;
 
-        if(fd == QHexFindDirection::All && i >= hexdocument->length()) i = 0;
+        if(fd == QHexFindDirection::All && i >= hexdocument->length() && restartLoopOnce)
+        {
+            i = 0; 
+            restartLoopOnce = false; 
+        }
     }
 
     return offset;