[FFmpeg-cvslog] 4xm: check the return value of read_huffman_tables().

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Feb 13 20:46:08 2013 +0100| [8097fc9a2dd49d8e467b16c8bafaa96242b7fe46] | committer: Anton Khirnov

4xm: check the return value of read_huffman_tables().

CC:libav-stable at libav.org

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

 libavcodec/4xm.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index fa5256c..82f8417 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -721,6 +721,10 @@ static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length)
     }
 
     prestream = read_huffman_tables(f, prestream);
+    if (!prestream) {
+        av_log(f->avctx, AV_LOG_ERROR, "Error reading Huffman tables.\n");
+        return AVERROR_INVALIDDATA;
+    }
 
     init_get_bits(&f->gb, buf + 4, 8 * bitstream_size);