From patchwork Tue May 11 11:12:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27716 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3879816iof; Tue, 11 May 2021 04:19:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwe0jZ1M4QomIpgmcYEMgAgWrlEd3RV1i2koRwSey8Km+bSBBeoYoC+GIqwflz5+3oIwXvC X-Received: by 2002:a17:906:c44d:: with SMTP id ck13mr31284659ejb.371.1620731949474; Tue, 11 May 2021 04:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620731949; cv=none; d=google.com; s=arc-20160816; b=K5Jut5fTE3dQQdwaxJ04R2CPuhPSW0ONNh8/OklhpzotHnH0gF4j1WBPyomqAUkXzy l/FQw8TKlnwZ2Maov/TZYSLVkSt1CUEHwrwWclVqvr930fsk9URar6VmJJdMqDvXPyLZ Z9ADiILbQBpOjbkwAPgtiDZgH9bZgvK5lzVCcH5UJ7cFEf2SJJhnvphqoC6M+p5T2V6G Ls+VIAspx5D1iBUApfFrh0cTHZSii068b4LkWobR3hbHUAPcgTH5mQ4eU7It2OWaiKHz wTJxOZCbMmf+jDrJ7F6O6md8FlcP4Ag2mQevBBGP2ET3PF1BtaV/N5GFEfdShqQWPu2V ClLw== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=fIocFLVYI+qwfZuJjrSvpbBsSakOBSHAcpHe6yrfG1Q=; b=xKn5zCuUs8pxG1GruPQShIIni1NY2ptz24TTc4WcSY56Lb1LwmjUE5ArNcLg4jo+cq c77gy7Sf6xYzKoFnuzbqDgH1hmiDl2cXrO1NRiJGHJsn0Y6Y+MlZaI/tRWJKFARWlzbw 9e+Jpco09JHHi1bCVHS4Sz0CirDfS3UsuRdXcHBH9Q0jnsTEV01E+kX66MLvWrasXyaO Hp1jCbogjq1aBl0HicRBkBVOnxsVNcfAOzFlx3egQaS61aPN0teyPtDhXjgCGSUB9rpq qHNVeUj7jVou2+BlFuiuILwdV5YDtHDaU9NXbNcUNdvynf+1+g+h4CM4lNecA3fqrHJZ 5RzA== 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 o32si15772061eda.316.2021.05.11.04.19.08; Tue, 11 May 2021 04:19:09 -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 8DCC3680CDE; Tue, 11 May 2021 14:19:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FA406801B4 for ; Tue, 11 May 2021 14:18:58 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lgQK3-00GOQO-0B for ffmpeg-devel@ffmpeg.org; Tue, 11 May 2021 13:13:07 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id gQJ5ljOhlljeHgQJ5lYXfB; Tue, 11 May 2021 13:12:07 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=zyaPAXdEVWJZX7Nd_gQA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 11 May 2021 13:12:06 +0200 Message-Id: <20210511111206.9982-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210511111206.9982-1-michael@niedermayer.cc> References: <20210511111206.9982-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfPxeC70n2CkSV2XcGwbAYyNC8jTJbvA1ZZX61bCQeal8cehY0KoABYI1fWhPG/u+EM8MFnWSWcflepQZzADHHbBIh1S8s8RMAV8+5xwnkYD3n8uSYkas 6BngfKloQ7Cq4eMUJ6l2z/l576+zTD2RR3T6bdCC3GYgM/ziN9758FRm Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/jpeglsdec: force pal8 only once X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: ovsITJ07vM7a Fixes: Infinite loop Fixes: 33958/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_THP_fuzzer-6590264069193728 Fixes: 33981/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-5343224173559808 Fixes: 33986/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEG_fuzzer-6598815122587648 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeglsdec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index c61cb14f49..32c0d2eb3f 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -118,9 +118,12 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s) shift = 8 - s->avctx->bits_per_raw_sample; } - s->force_pal8 = 1; - if (!pal) + s->force_pal8++; + if (!pal) { + if (s->force_pal8 > 1) + return AVERROR_INVALIDDATA; return 1; + } for (i=s->palette_index; i<=maxtab; i++) { uint8_t k = i << shift;