Limit maximum control frame length

Adopt C fstrm limit of 512 bytes, not including type+length.
farsightsec · Sep 8, 2020 · bde1d9b · bde1d9b
1 parent 22acee6
commit bde1d9b
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/Control.go b/Control.go
@@ -15,6 +15,8 @@ const CONTROL_FINISH = 0x05
 
 const CONTROL_FIELD_CONTENT_TYPE = 0x01
 
+const CONTROL_FRAME_LENGTH_MAX = 512
+
 type ControlFrame struct {
 	ControlType  uint32
 	ContentTypes [][]byte
@@ -75,6 +77,14 @@ func (c *ControlFrame) Decode(r io.Reader) (err error) {
 		return
 	}
 
+	if cflen > CONTROL_FRAME_LENGTH_MAX {
+		return ErrDecode
+	}
+
+	if cflen < 4 {
+		return ErrDecode
+	}
+
 	err = binary.Read(r, binary.BigEndian, &c.ControlType)
 	if err != nil {
 		return