Merge pull request #598 from matheusd/fix-msa

MultiSegmentArena: Fix release back into bufferpool
capnproto · Jan 10, 2025 · f9295d9 · f9295d9
2 parents b4bdc80 + c17d814
commit f9295d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/arena.go b/arena.go
@@ -267,6 +267,7 @@ func (msa *MultiSegmentArena) demux(hdr streamHeader, data []byte, bp *bufferpoo
 		msa.segs = append(msa.segs, make([]Segment, inc)...)
 	}
 
+	rawData := data
 	for i := SegmentID(0); i <= maxSeg; i++ {
 		sz, err := hdr.segmentSize(SegmentID(i))
 		if err != nil {
@@ -277,7 +278,7 @@ func (msa *MultiSegmentArena) demux(hdr streamHeader, data []byte, bp *bufferpoo
 		msa.segs[i].id = i
 	}
 
-	msa.rawData = data
+	msa.rawData = rawData
 	msa.bp = bp
 	return nil
 }

diff --git a/integration_test.go b/integration_test.go
@@ -1825,6 +1825,8 @@ func BenchmarkDecode(b *testing.B) {
 			if err != nil {
 				b.Fatal(err)
 			}
+
+			msg.Release()
 		}
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1825,6 +1825,8 @@ func BenchmarkDecode(b *testing.B) { @@
     			if err != nil {
     				b.Fatal(err)
     			}
+    			msg.Release()
     		}
     	}
     }
@@ Expand Down @@