Commit 6c3dba57 authored by Michael Niedermayer's avatar Michael Niedermayer

correct another possible buffer overflow where interlaced would

get stuck to 1 but then width/height would change and interlaced
wouldnt be reset ...

Originally committed as revision 8735 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c28baf06
......@@ -1171,6 +1171,7 @@ static int mjpeg_decode_sof(MJpegDecodeContext *s)
s->width = width;
s->height = height;
s->interlaced = 0;
/* test interlaced mode */
if (s->first_picture &&
......@@ -2258,8 +2259,6 @@ read_header:
skip_bits(&hgb, 32); /* padded field size */
second_field_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "second field offs: 0x%x\n", second_field_offs);
if (second_field_offs)
s->interlaced = 1;
dqt_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "dqt offs: 0x%x\n", dqt_offs);
......
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