Commit 3cbdbe16 authored by bcoudurier's avatar bcoudurier

Ok, ts demuxer is more complicated than I thought

Revert r18454 and fix correctly #700
Stop parsing if end of buffer is reached while reading
patch by Björn Axelsson, bjorn dot axelsson at intinor dot se


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18455 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 50e21548
......@@ -555,7 +555,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
if (desc_list_len < 0)
break;
desc_list_end = p + desc_list_len;
if (desc_list_end >= p_end)
if (desc_list_end > p_end)
break;
for(;;) {
desc_tag = get8(&p, desc_list_end);
......@@ -571,6 +571,8 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
}
}
desc_len = get8(&p, desc_list_end);
if (desc_len < 0)
break;
desc_end = p + desc_len;
if (desc_end > desc_list_end)
break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment