Module: libav Branch: release/12 Commit: 0738da5fc1c4df56190f760be8b5d9359441fc78
Author: Luca Barbato <[email protected]> Committer: Sean McGovern <[email protected]> Date: Mon Apr 17 19:25:35 2017 +0000 mm: Skip unexpected audio packets Bug-Id: 1046 CC: [email protected] (cherry picked from commit 1731c3530bffb876deb9e00dfffdf9841a8412cd) Signed-off-by: Sean McGovern <[email protected]> --- libavformat/mm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/mm.c b/libavformat/mm.c index 1650550..a94d261 100644 --- a/libavformat/mm.c +++ b/libavformat/mm.c @@ -174,6 +174,12 @@ static int read_packet(AVFormatContext *s, return 0; case MM_TYPE_AUDIO : + if (s->nb_streams != 2) { + av_log(s, AV_LOG_ERROR, + "Unexpected audio packet, skipping\n"); + avio_skip(pb, length); + return AVERROR_INVALIDDATA; + } if (av_get_packet(s->pb, pkt, length)<0) return AVERROR(ENOMEM); pkt->size = length; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
