[FFmpeg-cvslog] brstm: make sure an ADPC chunk was read for adpcm_thp
Andreas Cadhalpun
git at videolan.org
Thu Jan 28 02:26:25 CET 2016
ffmpeg | branch: release/2.6 | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Mon Jan 4 12:57:38 2016 +0100| [20d4c087ed8c55ceab48814bd715983f88b411c3] | committer: Andreas Cadhalpun
brstm: make sure an ADPC chunk was read for adpcm_thp
This fixes NULL pointer dereferencing.
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
(cherry picked from commit d7d37c479fa71639650751648275615e979beb33)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20d4c087ed8c55ceab48814bd715983f88b411c3
---
libavformat/brstm.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/brstm.c b/libavformat/brstm.c
index 19a4a2a..9228fa7 100644
--- a/libavformat/brstm.c
+++ b/libavformat/brstm.c
@@ -260,6 +260,11 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
if (codec->codec_id == AV_CODEC_ID_ADPCM_THP) {
uint8_t *dst;
+ if (!b->adpc) {
+ av_log(s, AV_LOG_ERROR, "adpcm_thp requires ADPC chunk, but none was found.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
if (av_new_packet(pkt, 8 + (32 + 4) * codec->channels + size) < 0)
return AVERROR(ENOMEM);
dst = pkt->data;
More information about the ffmpeg-cvslog
mailing list