From patchwork Sun Dec 27 17:49:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 24656 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C28E6449948 for ; Sun, 27 Dec 2020 19:50:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E17C68A817; Sun, 27 Dec 2020 19:50:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD36D689DB2 for ; Sun, 27 Dec 2020 19:50:45 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ktaBj-0008I1-0D for ffmpeg-devel@ffmpeg.org; Sun, 27 Dec 2020 18:50:39 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id taAlkGoRmO4rAtaAlk0la1; Sun, 27 Dec 2020 18:49:39 +0100 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=RNDN4Lq+ 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=E49ywm4EblqqMDkG-eoA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 27 Dec 2020 18:49:35 +0100 Message-Id: <20201227174938.27369-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201227174938.27369-1-michael@niedermayer.cc> References: <20201227174938.27369-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfHvmn+iGwnUK1FTatAYHs+UEkOxBY37LwiHITGNomd/sWpJFUslT2EMgen1ZuetNSJPq/YdGXWt0+mL7bD39cmqygjT42fGMXwOpYEPtVDJmRrYYH45O gaUOqH7O//C2PtgLGc9o2++SamLtTsqwv+E4kMa8E4VE43z/wzfSHBvm Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/tiff: Check strip values when they will be used 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" Regression since: da5b3d002862d1e105002a6dc1567e6551860896 Fixes: Assertion buf_size >= 0 failed at libavcodec/bytestream.h:151 Fixes: 28599/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5362335027953664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/tiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index fa1f44ce1d..d1ca45409a 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1930,7 +1930,7 @@ again: if ((ret = init_image(s, &frame)) < 0) return ret; - if (!s->is_tiled) { + if (has_strip_bits) { if (s->strips == 1 && !s->stripsize) { av_log(avctx, AV_LOG_WARNING, "Image data size missing\n"); s->stripsize = avpkt->size - s->stripoff;