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

fix ReadPESHeader DataLength zero bug

Browse Source
This commit is contained in:
nareix 2016-03-02 14:58:58 +08:00
parent d892f58a48
commit 80338a4803
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
reader.go
View File

@ -191,7 +191,7 @@ func ReadTSPacket(r io.Reader, data []byte) (self TSHeader, n int, err error) {
return return
} }
if DebugReader { if DebugReader {
fmt.Println("ts: data", lr.N) fmt.Println("ts: data len", lr.N)
} }
if n, err = lr.Read(data[:lr.N]); err != nil { if n, err = lr.Read(data[:lr.N]); err != nil {
return return
@ -494,16 +494,16 @@ func ReadPESHeader(r io.Reader) (res *PESHeader, err error) {
if length, err = ReadUInt(r, 2); err != nil { if length, err = ReadUInt(r, 2); err != nil {
return return
} }
if DebugReader {
fmt.Printf("pes: StreamId=%x length=%d\n", self.StreamId, length)
}
if length == 0 { if length == 0 {
length = 1<<31 length = 1<<31
} }
lrAll := &io.LimitedReader{R: r, N: int64(length)} lrAll := &io.LimitedReader{R: r, N: int64(length)}
lr := lrAll lr := lrAll
if DebugReader {
fmt.Printf("pes: StreamId=%x length=%d\n", self.StreamId, length)
}
// 10(2) // 10(2)
// PES scrambling control(2) // PES scrambling control(2)
// PES priority(1) // PES priority(1)
@ -670,10 +670,13 @@ func ReadPESHeader(r io.Reader) (res *PESHeader, err error) {
} }
} }
if lr.N > 0 && lr.N < 65536 { if lr.N > 0 {
if err = ReadDummy(lr, int(lr.N)); err != nil { if err = ReadDummy(lr, int(lr.N)); err != nil {
return return
} }
}
if lrAll.N < 65536 {
self.DataLength = uint(lrAll.N) self.DataLength = uint(lrAll.N)
} }