package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-05 15:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

check frame length against buffer length, not against a fixed length

Browse Source
This commit is contained in:
aler9
2020-01-20 22:11:57 +01:00
parent bcb72a4643
commit ea12a2ccff
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
conn.go
View File

@@ -39,7 +39,7 @@ func (c *Conn) WriteResponse(res *Response) error {
return responseEncode(c.nconn, res) return responseEncode(c.nconn, res)
} }
func (c *Conn) ReadInterleavedFrame(frame []byte) (int, int, error) { func (c *Conn) ReadInterleavedFrame(buf []byte) (int, int, error) {
var header [4]byte var header [4]byte
_, err := io.ReadFull(c.nconn, header[:]) _, err := io.ReadFull(c.nconn, header[:])
if err != nil { if err != nil {
@@ -56,11 +56,11 @@ func (c *Conn) ReadInterleavedFrame(frame []byte) (int, int, error) {
} }
framelen := binary.BigEndian.Uint16(header[2:]) framelen := binary.BigEndian.Uint16(header[2:])
if framelen > 2048 { if int(framelen) > len(buf) {
return 0, 0, fmt.Errorf("frame length greater than 2048") return 0, 0, fmt.Errorf("frame length greater than buffer length")
} }
_, err = io.ReadFull(c.nconn, frame[:framelen]) _, err = io.ReadFull(c.nconn, buf[:framelen])
if err != nil { if err != nil {
return 0, 0, err return 0, 0, err
} }