Commit bdd8e02b authored by Kieran Kunhya's avatar Kieran Kunhya Committed by James Darnley

avcodec/cfhd: Make sure we have an end of header tag before allocating a frame.

Fixes tickets #5208 and #5209
parent 9effa012
......@@ -224,7 +224,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
GetByteContext gb;
ThreadFrame frame = { .f = data };
AVFrame *pic = data;
int ret = 0, i, j, plane;
int ret = 0, i, j, plane, got_buffer = 0;
int16_t *coeff_data;
avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
......@@ -426,6 +426,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
s->coded_width = 0;
s->coded_height = 0;
got_buffer = 1;
}
coeff_data = s->plane[s->channel_num].subband[s->subband_num_actual];
......@@ -557,6 +558,12 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
goto end;
}
if (!got_buffer) {
av_log(avctx, AV_LOG_ERROR, "No end of header tag found\n");
ret = AVERROR(EINVAL);
goto end;
}
for (plane = 0; plane < 3 && !ret; plane++) {
/* level 1 */
int lowpass_height = s->plane[plane].band[0][0].height;
......
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