thefoxon/joy4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtsp: make sure EOF returns io.EOF

Browse Source
This commit is contained in:
nareix 2016-07-03 17:51:37 +08:00
parent f3da3caa49
commit 929adb2829
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
format/rtsp/client.go
View File

@ -377,7 +377,6 @@ func (self *Client) findRTSP() (block []byte, data []byte, err error) {
for { for {
var b byte var b byte
if b, err = self.brconn.ReadByte(); err != nil { if b, err = self.brconn.ReadByte(); err != nil {
err = fmt.Errorf("rtsp: find rtsp header failed: %v", err)
return return
} }
switch b { switch b {
@ -420,7 +419,6 @@ func (self *Client) findRTSP() (block []byte, data []byte, err error) {
left := blocklen+4-len(peek) left := blocklen+4-len(peek)
block = append(peek, make([]byte, left)...) block = append(peek, make([]byte, left)...)
if _, err = io.ReadFull(self.brconn, block[len(peek):]); err != nil { if _, err = io.ReadFull(self.brconn, block[len(peek):]); err != nil {
err = fmt.Errorf("rtsp: read block failed: %v", err)
return return
} }
return return
@ -447,7 +445,6 @@ func (self *Client) readLFLF() (block []byte, data []byte, err error) {
for { for {
var b byte var b byte
if b, err = self.brconn.ReadByte(); err != nil { if b, err = self.brconn.ReadByte(); err != nil {
err = fmt.Errorf("rtsp: read LFLF failed: %v", err)
return return
} }
switch b { switch b {
@ -476,7 +473,6 @@ func (self *Client) readLFLF() (block []byte, data []byte, err error) {
if blocklen, _, ok := self.parseBlockHeader(peek[start:]); ok { if blocklen, _, ok := self.parseBlockHeader(peek[start:]); ok {
block = append(peek[start:], make([]byte, blocklen+4-hdrlen)...) block = append(peek[start:], make([]byte, blocklen+4-hdrlen)...)
if _, err = io.ReadFull(self.brconn, block[hdrlen:]); err != nil { if _, err = io.ReadFull(self.brconn, block[hdrlen:]); err != nil {
err = fmt.Errorf("rtsp: read block failed: %v", err)
return return
} }
return return
@ -498,7 +494,6 @@ func (self *Client) readResp(b []byte) (res Response, err error) {
if res.ContentLength > 0 { if res.ContentLength > 0 {
res.Body = make([]byte, res.ContentLength) res.Body = make([]byte, res.ContentLength)
if _, err = io.ReadFull(self.brconn, res.Body); err != nil { if _, err = io.ReadFull(self.brconn, res.Body); err != nil {
err = fmt.Errorf("rtsp: read body failed: %v", err)
return return
} }
} }