[FFmpeg-cvslog] indeo4: check band->scan

Michael Niedermayer git at videolan.org
Fri Mar 23 04:45:22 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 23 04:18:10 2012 +0100| [c0a99eae296177b22387fab8921d079088d8a54b] | committer: Michael Niedermayer

indeo4: check band->scan

Fixes null ptr exception

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0a99eae296177b22387fab8921d079088d8a54b
---

 libavcodec/indeo4.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index 8ba8e25..df80b11 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -444,6 +444,11 @@ static int decode_band_hdr(IVI4DecContext *ctx, IVIBandDesc *band,
 
     align_get_bits(&ctx->gb);
 
+    if (!band->scan) {
+        av_log(avctx, AV_LOG_ERROR, "band->scan not set\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     return 0;
 }
 



More information about the ffmpeg-cvslog mailing list