streaming/api: fix overlap check

In some cases a SBB could be seen as overlapping with the requested
offset, when it was in fact precisely before it. In some special cases
this could lead to the stream engine not progressing the 'raw' progress.

diff --git a/src/util-streaming-buffer.c b/src/util-streaming-buffer.c
index a3c04c465658aa5b8876c0f02e302efa3285eeb2..c2e8cde75e1bfaa9c10f07ebe30d5b5b6a7a827a 100644 (file)
--- a/src/util-streaming-buffer.c
+++ b/src/util-streaming-buffer.c
@@ -70,7 +70,7 @@ static inline int InclusiveCompare(StreamingBufferBlock *lookup, StreamingBuffer
     const uint64_t tre = intree->offset + intree->len;
     if (lre <= intree->offset)   // entirely before
         return -1;
-    else if (lre >= intree->offset && lre <= tre)    // (some) overlap
+    else if (lre >= intree->offset && lookup->offset < tre && lre <= tre)   // (some) overlap
         return 0;
     else
         return 1;   // entirely after