Module: libav Branch: release/0.5 Commit: c4e8c99507b0b4ad384bea061afb6025ca868174
Author: Michael Niedermayer <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Tue Jan 24 17:51:40 2012 +0100 dv: Fix null pointer dereference due to ach=0 dv: Fix null pointer dereference due to ach=0 Fixes part2 of CVE-2011-3929 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Reviewed-by: Roman Shaposhnik <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> Signed-off-by: Alex Converse <[email protected]> (cherry picked from commit 5a396bb3a66a61a68b80f2369d0249729bf85e04) Signed-off-by: Reinhard Tartler <[email protected]> (cherry picked from commit 44e182d41e3a73548f3f5e8445ec428d3846e6d6) Signed-off-by: Reinhard Tartler <[email protected]> (cherry picked from commit b46141b0d1d7efb74dad172b7c1b52413441592f) Conflicts: libavformat/dv.c --- libavformat/dv.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libavformat/dv.c b/libavformat/dv.c index c650b5b..54ed818 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -341,7 +341,8 @@ int dv_produce_packet(DVDemuxContext *c, AVPacket *pkt, c->audio_pkt[i].pts = c->abytes * 30000*8 / c->ast[i]->codec->bit_rate; ppcm[i] = c->audio_buf[i]; } - dv_extract_audio(buf, ppcm, c->sys); + if (c->ach) + dv_extract_audio(buf, ppcm, c->sys); c->abytes += size; /* We work with 720p frames split in half, thus even frames have _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
