diff options
| author | Zohar Kelrich <lumimies@gmail.com> | 2011-07-24 11:13:51 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2011-08-02 02:52:41 +0200 |
| commit | 5081514269a17809f8a8ff71e6b26e4b761e8266 (patch) | |
| tree | 80141c7095b6a664f231c731894dc0307d53b520 /libavformat/mpegts.c | |
| parent | cdb9884a636987061d549ac23a248aabc4a91140 (diff) | |
| download | ffmpeg-5081514269a17809f8a8ff71e6b26e4b761e8266.tar.gz | |
mpegts: Mark wrongly-sized packets as corrupted
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index a5a8ce2a67..2bc66ac685 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -625,6 +625,12 @@ static void new_pes_packet(PESContext *pes, AVPacket *pkt) pkt->destruct = av_destruct_packet; pkt->data = pes->buffer; pkt->size = pes->data_index; + + if(pes->total_size != MAX_PES_PAYLOAD && + pes->pes_header_size + pes->data_index != pes->total_size + 6) { + av_log(pes->ts, AV_LOG_WARNING, "PES packet size mismatch\n"); + pes->flags |= AV_PKT_FLAG_CORRUPT; + } memset(pkt->data+pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE); // Separate out the AC3 substream from an HDMV combined TrueHD/AC3 PID @@ -811,7 +817,6 @@ static int mpegts_push_data(MpegTSFilter *filter, // pes packet size is < ts size packet and pes data is padded with 0xff // not sure if this is legal in ts but see issue #2392 buf_size = pes->total_size; - pes->flags |= AV_PKT_FLAG_CORRUPT; } memcpy(pes->buffer+pes->data_index, p, buf_size); pes->data_index += buf_size; @@ -1288,7 +1293,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet) tss->last_cc = cc; if (!cc_ok) { - av_log(NULL, AV_LOG_WARNING, "Continuity Check Failed\n"); + av_log(ts, AV_LOG_WARNING, "Continuity Check Failed\n"); if(tss->type == MPEGTS_PES) { PESContext *pc = tss->u.pes_filter.opaque; pc->flags |= AV_PKT_FLAG_CORRUPT; |