From patchwork Wed Oct 25 22:02:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 5691 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp109627jah; Wed, 25 Oct 2017 15:03:24 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TQMKsXYyWwstXaSVzzIO++2yN5n69IQUnSwKWnWn/tn3xNDJOIuuGzrNih6sWVwyKtp0B8 X-Received: by 10.223.142.208 with SMTP id q74mr3856947wrb.172.1508969004450; Wed, 25 Oct 2017 15:03:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508969004; cv=none; d=google.com; s=arc-20160816; b=00XKS7yn1y419a3O7IotRftIqSquprE0QamOWHBXqo6062V9Xw7RfA8MojZnEiQJ3+ Y2JuOCBDJ6/qVX7lX81+dhaBwAwL0KBTSGqq6zAvOHSzmNUnkTfUeZi3aRkC4I5Gi4xL gbed1Lk3mjuEDtso5eCOYavjK98pS/EXGj3I4bxfHWkTr/sYIQvFjDDd372xoz3DRu8r Pa5yPZVqx/SvfP+eKEAqcv8/ioGMzlEAysVDVka/AeoBRjHNc9+crJ8FwJgVZghmm4hQ u6vodHYMZ9oZ91YA8zeiu4yk1cMir+VX3GM0AGn/E9iE8ynhTv8E/EFcpbcdWWo3ORR9 Im9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=FwqhpNzmqWiCEb1SUzAe3Jiy7aBLPlvrPM0G+dm6Puc=; b=bnMqPfVxqUjXZxCtnbtE1MP03FOHBpVJMFb2niJfQG/7sQ2PoahgcrQxo9jmHXSNIm /gdGp3wSBiZQ8Xws1mLN8QVNDoUoh0U2KrBoI4sTZZqb2vbXaJv83nt6hf1AK4AWwQWl 1ZOxpRkUqzc2FS6oPOkjtUNXr+PqlVvGEPfi2irtnRwH8ijYoiVjKQrdy2BO2QWM1VQ1 oMkSLk7HGPo76plkouRzqKD6d0DMZZXmDg9NImG/7yOpYR4RZVdMGSpc7vebwPbD3EqS PN5j7UHfhYHbAH//Vy109hxBM+m9pTASnOB4Yx0D8b6EdFze7SLYOjc4pl1Ug2SKJjnA zLmg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o20si2677001wmi.78.2017.10.25.15.03.24; Wed, 25 Oct 2017 15:03:24 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2054F68A53C; Thu, 26 Oct 2017 01:03:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-1.mx.upcmail.net (vie01a-qmta-pe02-1.mx.upcmail.net [62.179.121.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7629968A3AA for ; Thu, 26 Oct 2017 01:03:03 +0300 (EEST) Received: from [172.31.218.54] (helo=vie01a-dmta-pe08-3.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1e7TlX-0001pX-7S for ffmpeg-devel@ffmpeg.org; Thu, 26 Oct 2017 00:03:11 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1e7TlR-0003iS-Iu for ffmpeg-devel@ffmpeg.org; Thu, 26 Oct 2017 00:03:05 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Ry2y1w00t0S5wYM01y2z2E; Thu, 26 Oct 2017 00:02:59 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 26 Oct 2017 00:02:56 +0200 Message-Id: <20171025220257.7790-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/jpeglsdec: Check ilv for being a supported value X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 --- libavcodec/jpeglsdec.c | 4 ++++ 1 file changed, 4 insertions(+) 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) {