Module: libav Branch: release/0.8 Commit: e797b7787b258be7561939904442165510f381a6
Author: Anton Khirnov <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Wed Feb 13 20:46:08 2013 +0100 4xm: check the return value of read_huffman_tables(). CC:[email protected] (cherry picked from commit 8097fc9a2dd49d8e467b16c8bafaa96242b7fe46) Signed-off-by: Reinhard Tartler <[email protected]> (cherry picked from commit bb3f1cad171b31537b64a9d19cabdbff50aca260) Signed-off-by: Reinhard Tartler <[email protected]> Conflicts: libavcodec/4xm.c --- libavcodec/4xm.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index c210e46..efaf939 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -679,7 +679,11 @@ static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length){ return -1; } - prestream= read_huffman_tables(f, prestream); + 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); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
