Merge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec'

* commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec':
  lavfi doxy: add a page for lavfi.
  jpegls: check the scan offset

Conflicts:
	libavcodec/jpeglsdec.c
	libavfilter/avfilter.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 4 insertions, 0 deletions

diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index c133cfb207..3af230d1db 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -311,6 +311,10 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
                 ilv, point_transform, s->bits, s->cur_scan);
     }
     if (ilv == 0) { /* separate planes */
+        if (s->cur_scan > s->nb_components) {
+            ret = AVERROR_INVALIDDATA;
+            goto end;
+        }
         stride = (s->nb_components > 1) ? 3 : 1;
         off    = av_clip(s->cur_scan - 1, 0, stride - 1);
         width  = s->width * stride;