Commit bbc4d069 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/cfhd: Check the number of tag/value pairs

Fixes potentially long loop
Fixes: CID1351382/11
Reviewed-by: 's avatarKieran Kunhya <kieran@kunhya.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 15601311
......@@ -344,6 +344,11 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
break;
} else if (tag == 2) {
av_log(avctx, AV_LOG_DEBUG, "tag=2 header - skipping %i tag/value pairs\n", data);
if (data > bytestream2_get_bytes_left(&gb) / 4) {
av_log(avctx, AV_LOG_ERROR, "too many tag/value pairs (%d)\n", data);
ret = AVERROR_INVALIDDATA;
break;
}
for (i = 0; i < data; i++) {
uint16_t tag2 = bytestream2_get_be16(&gb);
uint16_t val2 = bytestream2_get_be16(&gb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment