diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-13 17:18:41 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-05-02 10:29:51 -0700 |
| commit | 5eec5a79da118170f3cfe185a862783d3fa50abe (patch) | |
| tree | 2502349b1e8302079682c66871de2868a446f55e | |
| parent | 1f05dcbad243622020151a3b0b45c68ea5f2866c (diff) | |
| download | ffmpeg-streaming-5eec5a79da118170f3cfe185a862783d3fa50abe.zip ffmpeg-streaming-5eec5a79da118170f3cfe185a862783d3fa50abe.tar.gz | |
jpeg: handle progressive in second field of interlaced.
Progressive data is allocated later in decode_sof(), not allocating
that data leads to NULL dereferences.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
| -rw-r--r-- | libavcodec/mjpegdec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 8552ec1..7864d38 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -301,9 +301,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) s->first_picture = 0; } - if (s->interlaced && (s->bottom_field == !s->interlace_polarity)) - return 0; - + if (!(s->interlaced && (s->bottom_field == !s->interlace_polarity))) { /* XXX: not complete test ! */ pix_fmt_id = (s->h_count[0] << 28) | (s->v_count[0] << 24) | (s->h_count[1] << 20) | (s->v_count[1] << 16) | @@ -370,6 +368,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) if (len != (8 + (3 * nb_components))) av_log(s->avctx, AV_LOG_DEBUG, "decode_sof0: error, len(%d) mismatch\n", len); + } /* totally blank picture as progressive JPEG will only add details to it */ if (s->progressive) { |
