Fix Combine buffer panic when analyze protocol (#184)

apache · Mar 11, 2025 · ff46ccf · ff46ccf
1 parent ecb6e8c
commit ff46ccf
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/pkg/tools/buffer/buffer.go b/pkg/tools/buffer/buffer.go
@@ -437,9 +437,18 @@ func CombineSlices(validated bool, originalBuffer *Buffer, buffers ...*Buffer) *
 		}
 	}
 
-	var endPosition = buffers[len(buffers)-1].endPosition
-	if endPosition == nil {
-		endPosition = buffers[len(buffers)-1].Position()
+	var endPosition *Position
+	for i := len(buffers) - 1; i >= 0; i-- {
+		if buffers[i] == nil {
+			continue
+		}
+		if buffers[i].endPosition != nil {
+			endPosition = buffers[i].endPosition
+			break
+		} else if buffers[i].Position() != nil {
+			endPosition = buffers[i].Position()
+			break
+		}
 	}
 	return &Buffer{
 		dataEvents:     dataEvents,