aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-10-26 00:02:56 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-12-02 00:28:59 +0100
commit52bb493afaa51e9929929412a3c37434c109acea (patch)
tree51ee7bbc785675e23e23176bad586f40793a94e6
parent94e538aebbc9f9c529e8b1f2eda860cfb8c473b1 (diff)
downloadffmpeg-52bb493afaa51e9929929412a3c37434c109acea.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 20b40445fd..60701d69fd 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -438,6 +438,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) {