reassembly: fix check overlap for case 6

google · Oct 19, 2020 · a9779d1 · a9779d1
1 parent 78e86bc
commit a9779d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/reassembly/tcpassembly.go b/reassembly/tcpassembly.go
@@ -833,7 +833,7 @@ func (a *Assembler) checkOverlap(half *halfconnection, queue bool, ac AssemblerC
 		} else
 
 		// end < cur.end && start > cur.start: replace bytes inside cur (6)
-		if diffEnd > 0 && diffStart < 0 {
+		if diffEnd >= 0 && diffStart <= 0 {
 			if *debugLog {
 				log.Printf("case 6\n")
 			}

diff --git a/reassembly/tcpassembly_test.go b/reassembly/tcpassembly_test.go
@@ -463,8 +463,8 @@ func TestBufferedOverlapCase6(t *testing.T) {
 			in: layers.TCP{
 				SrcPort:   1,
 				DstPort:   2,
-				Seq:       1010,
-				BaseLayer: layers.BaseLayer{Payload: []byte{10, 11, 12, 13, 14}},
+				Seq:       1007,
+				BaseLayer: layers.BaseLayer{Payload: []byte{7, 8, 9, 10, 11, 12, 13, 14}},
 			},
 			want: []Reassembly{},
 		},