virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

mpegts: prevent freeing ones own section in pmt_cb

Browse Source 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-11-13 15:21:41 +01:00
parent 09a0392341
commit 327cd0d09b
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mpegts.c
View File

@@ -127,6 +127,7 @@ struct MpegTSContext {
/** filters for various streams specified by PMT + for the PAT and PMT */ /** filters for various streams specified by PMT + for the PAT and PMT */
MpegTSFilter *pids[NB_PID_MAX]; MpegTSFilter *pids[NB_PID_MAX];
int current_pid;
}; };
static const AVOption options[] = { static const AVOption options[] = {
@@ -1493,6 +1494,8 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
if (pid < 0) if (pid < 0)
break; break;
pid &= 0x1fff; pid &= 0x1fff;
if (pid == ts->current_pid)
break;
/* now create stream */ /* now create stream */
if (ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES) { if (ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES) {
@@ -1701,6 +1704,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet)
} }
if (!tss) if (!tss)
return 0; return 0;
ts->current_pid = pid;
afc = (packet[3] >> 4) & 3; afc = (packet[3] >> 4) & 3;
if (afc == 0) /* reserved value */ if (afc == 0) /* reserved value */