aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-10-26 00:02:56 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-11-01 22:15:31 +0100
commit84b83ecbfd4f42be64e9e125348204647d4afb01 (patch)
tree00e5ac2271bbad833a24b77728121b14bc12e24e
parent209bd75519a3177c8411c0dc42984cc885be92c9 (diff)
downloadffmpeg-84b83ecbfd4f42be64e9e125348204647d4afb01.tar.gz
avcodec/jpeglsdec: Check ilv for being a supported value
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> (cherry picked from commit fe533628b9604e2f8e5179d5c5dd17c3cb764265) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/jpeglsdec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index 7d25953068..62c8189c94 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -422,6 +422,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) {