diff mbox

[FFmpeg-devel,1/2] avcodec/jpeglsdec: Check ilv for being a supported value

Message ID 20171025220257.7790-1-michael@niedermayer.cc
State Accepted
Commit fe533628b9604e2f8e5179d5c5dd17c3cb764265
Headers show

Commit Message

Michael Niedermayer Oct. 25, 2017, 10:02 p.m. UTC
Fixes: 1773/clusterfuzz-testcase-minimized-4832523987189760

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/jpeglsdec.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Niedermayer Oct. 29, 2017, 4:20 p.m. UTC | #1
On Thu, Oct 26, 2017 at 12:02:56AM +0200, Michael Niedermayer wrote:
> Fixes: 1773/clusterfuzz-testcase-minimized-4832523987189760
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/jpeglsdec.c | 4 ++++
>  1 file changed, 4 insertions(+)

will apply patchset


[...]
diff mbox

Patch

diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index 64505321af..cb2f89a88c 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -443,6 +443,10 @@  int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
         avpriv_report_missing_feature(s->avctx, "Sample interleaved images");
         ret = AVERROR_PATCHWELCOME;
         goto end;
+    } else { /* unknown interleaving */
+        avpriv_report_missing_feature(s->avctx, "Unknown interleaved images");
+        ret = AVERROR_PATCHWELCOME;
+        goto end;
     }
 
     if (s->xfrm && s->nb_components == 3) {