hq_hqa: Fix decoding when INFO section is absent

This commit is contained in:
Vittorio Giovara 2015-07-10 15:52:00 +01:00
parent a53540840d
commit 0cf5588d69

View File

@ -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;