From 0cf5588d69922aa3e063bac6304c09c543a9ef52 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Fri, 10 Jul 2015 15:52:00 +0100 Subject: hq_hqa: Fix decoding when INFO section is absent --- libavcodec/hq_hqa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libavcodec/hq_hqa.c') diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c index ae378e6524..4871c59c83 100644 --- a/libavcodec/hq_hqa.c +++ b/libavcodec/hq_hqa.c @@ -310,9 +310,11 @@ static int hq_hqa_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - info_tag = bytestream2_get_le32(&ctx->gbc); + info_tag = bytestream2_peek_le32(&ctx->gbc); if (info_tag == MKTAG('I', 'N', 'F', 'O')) { - int info_size = bytestream2_get_le32(&ctx->gbc); + int info_size; + bytestream2_skip(&ctx->gbc, 4); + info_size = bytestream2_get_le32(&ctx->gbc); if (bytestream2_get_bytes_left(&ctx->gbc) < info_size) { av_log(avctx, AV_LOG_ERROR, "Invalid INFO size (%d).\n", info_size); return AVERROR_INVALIDDATA; -- cgit v1.2.3