This fixes NULL pointer dereferencing.
Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
---
libavformat/brstm.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/brstm.c b/libavformat/brstm.c
index bbdbcef..6ec4d89 100644
--- a/libavformat/brstm.c
+++ b/libavformat/brstm.c
@@ -389,6 +389,11 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
codec->codec_id == AV_CODEC_ID_ADPCM_THP_LE) {
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 (size > (INT_MAX - 32 - 4) ||
(32 + 4 + size) > (INT_MAX / codec->channels) ||
(32 + 4 + size) * codec->channels > INT_MAX - 8)
--
2.6.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
