implement a buffer pool for STREAM frames

2019-09-04 16:45:39 +07:00
parent 326ec9e16e
commit 5ea33cd31e
70 changed files with 193 additions and 48 deletions
--- a/fuzzing/frames/corpus/multiple-frames-0
+++ b/fuzzing/frames/corpus/multiple-frames-0
--- a/fuzzing/frames/corpus/multiple-frames-1
+++ b/fuzzing/frames/corpus/multiple-frames-1
--- a/fuzzing/frames/corpus/multiple-frames-10
+++ b/fuzzing/frames/corpus/multiple-frames-10
--- a/fuzzing/frames/corpus/multiple-frames-11
+++ b/fuzzing/frames/corpus/multiple-frames-11
--- a/fuzzing/frames/corpus/multiple-frames-12
+++ b/fuzzing/frames/corpus/multiple-frames-12
--- a/fuzzing/frames/corpus/multiple-frames-13
+++ b/fuzzing/frames/corpus/multiple-frames-13
--- a/fuzzing/frames/corpus/multiple-frames-14
+++ b/fuzzing/frames/corpus/multiple-frames-14
--- a/fuzzing/frames/corpus/multiple-frames-15
+++ b/fuzzing/frames/corpus/multiple-frames-15
--- a/fuzzing/frames/corpus/multiple-frames-16
+++ b/fuzzing/frames/corpus/multiple-frames-16
--- a/fuzzing/frames/corpus/multiple-frames-17
+++ b/fuzzing/frames/corpus/multiple-frames-17
--- a/fuzzing/frames/corpus/multiple-frames-18
+++ b/fuzzing/frames/corpus/multiple-frames-18
--- a/fuzzing/frames/corpus/multiple-frames-19
+++ b/fuzzing/frames/corpus/multiple-frames-19
--- a/fuzzing/frames/corpus/multiple-frames-2
+++ b/fuzzing/frames/corpus/multiple-frames-2
--- a/fuzzing/frames/corpus/multiple-frames-20
+++ b/fuzzing/frames/corpus/multiple-frames-20
--- a/fuzzing/frames/corpus/multiple-frames-21
+++ b/fuzzing/frames/corpus/multiple-frames-21
--- a/fuzzing/frames/corpus/multiple-frames-22
+++ b/fuzzing/frames/corpus/multiple-frames-22
--- a/fuzzing/frames/corpus/multiple-frames-23
+++ b/fuzzing/frames/corpus/multiple-frames-23
--- a/fuzzing/frames/corpus/multiple-frames-24
+++ b/fuzzing/frames/corpus/multiple-frames-24
--- a/fuzzing/frames/corpus/multiple-frames-3
+++ b/fuzzing/frames/corpus/multiple-frames-3
--- a/fuzzing/frames/corpus/multiple-frames-4
+++ b/fuzzing/frames/corpus/multiple-frames-4
--- a/fuzzing/frames/corpus/multiple-frames-5
+++ b/fuzzing/frames/corpus/multiple-frames-5
--- a/fuzzing/frames/corpus/multiple-frames-6
+++ b/fuzzing/frames/corpus/multiple-frames-6
--- a/fuzzing/frames/corpus/multiple-frames-7
+++ b/fuzzing/frames/corpus/multiple-frames-7
--- a/fuzzing/frames/corpus/multiple-frames-8
+++ b/fuzzing/frames/corpus/multiple-frames-8
--- a/fuzzing/frames/corpus/multiple-frames-9
+++ b/fuzzing/frames/corpus/multiple-frames-9
--- a/fuzzing/frames/corpus/single-frame-0
+++ b/fuzzing/frames/corpus/single-frame-0
@@ -1 +1 @@
-s	<09><><EFBFBD>
+
--- a/fuzzing/frames/corpus/single-frame-1
+++ b/fuzzing/frames/corpus/single-frame-1
@@ -1 +1 @@
-Ą	´ŮÉ		ÝťRß×›MvB›azźź
+d	´ŮÉ		ÝťRß×›MvB›azźź
--- a/fuzzing/frames/corpus/single-frame-10
+++ b/fuzzing/frames/corpus/single-frame-10
@@ -1 +1 @@
-<EFBFBD>74
+W
--- a/fuzzing/frames/corpus/single-frame-11
+++ b/fuzzing/frames/corpus/single-frame-11
@@ -1 +1 @@
-¦z‹˙˙˙˙˙˙˙˙
+<EFBFBD>fL<66>l<EFBFBD>Q5
--- a/fuzzing/frames/corpus/single-frame-12
+++ b/fuzzing/frames/corpus/single-frame-12
--- a/fuzzing/frames/corpus/single-frame-13
+++ b/fuzzing/frames/corpus/single-frame-13
--- a/fuzzing/frames/corpus/single-frame-14
+++ b/fuzzing/frames/corpus/single-frame-14
--- a/fuzzing/frames/corpus/single-frame-15
+++ b/fuzzing/frames/corpus/single-frame-15
--- a/fuzzing/frames/corpus/single-frame-16
+++ b/fuzzing/frames/corpus/single-frame-16
@@ -1 +1,2 @@
-?ｲlｺQ
+6
+u*.租ﾏ<05>ﾒ
--- a/fuzzing/frames/corpus/single-frame-17
+++ b/fuzzing/frames/corpus/single-frame-17
@@ -1 +1 @@
-<EFBFBD><10><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+wK
--- a/fuzzing/frames/corpus/single-frame-18
+++ b/fuzzing/frames/corpus/single-frame-18
@@ -1 +1 @@
-<EFBFBD>5<><35>M
+<EFBFBD><10><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--- a/fuzzing/frames/corpus/single-frame-19
+++ b/fuzzing/frames/corpus/single-frame-19
@@ -1 +1 @@
-
+<EFBFBD>H<>
--- a/fuzzing/frames/corpus/single-frame-2
+++ b/fuzzing/frames/corpus/single-frame-2
--- a/fuzzing/frames/corpus/single-frame-20
+++ b/fuzzing/frames/corpus/single-frame-20
@@ -1 +1 @@
-M<13><EFBFBD>
+<EFBFBD><11><>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--- a/fuzzing/frames/corpus/single-frame-21
+++ b/fuzzing/frames/corpus/single-frame-21
@@ -1 +1 @@
-/'
+Z•ňG&
--- a/fuzzing/frames/corpus/single-frame-22
+++ b/fuzzing/frames/corpus/single-frame-22
@@ -1 +1 @@
-<EFBFBD>R<>
+•`Ο
--- a/fuzzing/frames/corpus/single-frame-23
+++ b/fuzzing/frames/corpus/single-frame-23
@@ -1 +1 @@
-P<14><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD>
--- a/fuzzing/frames/corpus/single-frame-24
+++ b/fuzzing/frames/corpus/single-frame-24
@@ -1 +1 @@
-o/
+<EFBFBD><14><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--- a/fuzzing/frames/corpus/single-frame-25
+++ b/fuzzing/frames/corpus/single-frame-25
@@ -1 +1 @@
-<EFBFBD><EFBFBD>g<><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD>5z<EFBFBD>
--- a/fuzzing/frames/corpus/single-frame-26
+++ b/fuzzing/frames/corpus/single-frame-26
@@ -1 +1 @@
-îE
+k€<6B><E282AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--- a/fuzzing/frames/corpus/single-frame-27
+++ b/fuzzing/frames/corpus/single-frame-27
@@ -1 +1 @@
-<EFBFBD>L<>
+В•Ј.
--- a/fuzzing/frames/corpus/single-frame-28
+++ b/fuzzing/frames/corpus/single-frame-28
@@ -1 +1 @@
-
+<EFBFBD><16><12>M
--- a/fuzzing/frames/corpus/single-frame-29
+++ b/fuzzing/frames/corpus/single-frame-29
--- a/fuzzing/frames/corpus/single-frame-3
+++ b/fuzzing/frames/corpus/single-frame-3
@@ -1 +1 @@
-C
+w
--- a/fuzzing/frames/corpus/single-frame-30
+++ b/fuzzing/frames/corpus/single-frame-30
--- a/fuzzing/frames/corpus/single-frame-31
+++ b/fuzzing/frames/corpus/single-frame-31
--- a/fuzzing/frames/corpus/single-frame-32
+++ b/fuzzing/frames/corpus/single-frame-32
--- a/fuzzing/frames/corpus/single-frame-33
+++ b/fuzzing/frames/corpus/single-frame-33
@@ -1 +1 @@
-<EFBFBD>
+
--- a/fuzzing/frames/corpus/single-frame-34
+++ b/fuzzing/frames/corpus/single-frame-34
@@ -1 +1 @@
-ËFFÓÔ˙ćŐ™VQ__S‡ä”f™Ł®ÁJ|¶®»
+w˝[ŢmĽ!źvť)n§vDÝ¸#¨/ş
--- a/fuzzing/frames/corpus/single-frame-35
+++ b/fuzzing/frames/corpus/single-frame-35
--- a/fuzzing/frames/corpus/single-frame-36
+++ b/fuzzing/frames/corpus/single-frame-36
--- a/fuzzing/frames/corpus/single-frame-4
+++ b/fuzzing/frames/corpus/single-frame-4
@@ -1 +1,2 @@
-<EFBFBD>
+}
+gÊ†+«ÔKu!_²‚ˆ]2`ñÞ—‚ƒÔ š6ùl ”FãíM¦F©®‹O§´ü: ºúuí2z†¸°ÃšñÏÒ³µêyS:¿D<C2BF>,G<>2`u3<75>YÈÌð<>£ž’<>J¼¼±i9{·4çï
--- a/fuzzing/frames/corpus/single-frame-5
+++ b/fuzzing/frames/corpus/single-frame-5
@@ -1 +1 @@
-с<0C><>В_џџџџџџџџЮІшПF`ёо<D191><D0BE>
+¦
--- a/fuzzing/frames/corpus/single-frame-6
+++ b/fuzzing/frames/corpus/single-frame-6
--- a/fuzzing/frames/corpus/single-frame-7
+++ b/fuzzing/frames/corpus/single-frame-7
--- a/fuzzing/frames/corpus/single-frame-8
+++ b/fuzzing/frames/corpus/single-frame-8
--- a/fuzzing/frames/corpus/single-frame-9
+++ b/fuzzing/frames/corpus/single-frame-9
--- a/fuzzing/frames/fuzz.go
+++ b/fuzzing/frames/fuzz.go
@@ -57,6 +57,7 @@ func Fuzz(data []byte) int {
 		// We accept empty STREAM frames, but we don't write them.
 		if sf, ok := f.(*wire.StreamFrame); ok {
 			if sf.DataLen() == 0 {
+				sf.PutBack()
 				continue
 			}
 		}
@@ -68,6 +69,9 @@ func Fuzz(data []byte) int {
 		if f.Length(version) != protocol.ByteCount(frameLen) {
 			panic(fmt.Sprintf("Inconsistent frame length for %#v: expected %d, got %d", f, frameLen, f.Length(version)))
 		}
+		if sf, ok := f.(*wire.StreamFrame); ok {
+			sf.PutBack()
+		}
 	}
 	if b.Len() > parsedLen {
 		panic(fmt.Sprintf("Serialized length (%d) is longer than parsed length (%d)", b.Len(), parsedLen))
--- a/fuzzing/frames/main.go
+++ b/fuzzing/frames/main.go
@@ -88,6 +88,12 @@ func getFrames() []wire.Frame {
 			Data:     getRandomData(50),
 			FinBit:   true,
 		},
+		&wire.StreamFrame{ // STREAM frame at non-zero offset, with data and FIN bit. Long enough to use the buffer.
+			StreamID: protocol.StreamID(getRandomNumber()),
+			Offset:   protocol.ByteCount(getRandomNumber()),
+			Data:     getRandomData(2 * protocol.MinStreamFrameBufferSize),
+			FinBit:   true,
+		},
 		&wire.StreamFrame{ // STREAM frame at maximum offset, with FIN bit
 			StreamID: protocol.StreamID(getRandomNumber()),
 			Offset:   protocol.MaxByteCount - 5,