diff options
| author | Michael Niedermayer <[email protected]> | 2012-01-24 17:51:40 +0100 |
|---|---|---|
| committer | Reinhard Tartler <[email protected]> | 2012-04-01 18:33:28 +0200 |
| commit | 44e182d41e3a73548f3f5e8445ec428d3846e6d6 (patch) | |
| tree | 846da9dcf2a69a12825fd129e6474d7e8d37d00a | |
| parent | bb737d381f6d6413899a0697f426fb082eac66fc (diff) | |
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]>
| -rw-r--r-- | libavformat/dv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/dv.c b/libavformat/dv.c index fe6dac600e..cd1efddaad 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); /* We work with 720p frames split in half, thus even frames have * channels 0,1 and odd 2,3. */ |