Browse Source

mpegts: prevent freeing ones own section in pmt_cb

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
Michael Niedermayer 13 years ago
parent
commit
327cd0d09b
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      libavformat/mpegts.c

+ 4
- 0
libavformat/mpegts.c View File

@@ -127,6 +127,7 @@ struct MpegTSContext {

/** filters for various streams specified by PMT + for the PAT and PMT */
MpegTSFilter *pids[NB_PID_MAX];
int current_pid;
};

static const AVOption options[] = {
@@ -1493,6 +1494,8 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
if (pid < 0)
break;
pid &= 0x1fff;
if (pid == ts->current_pid)
break;

/* now create stream */
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)
return 0;
ts->current_pid = pid;

afc = (packet[3] >> 4) & 3;
if (afc == 0) /* reserved value */


Loading…
Cancel
Save