From patchwork Sun Dec 18 17:08:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39721 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp3342897pzb; Sun, 18 Dec 2022 09:08:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf4zvgQOtuKDmrxffS1rEmSWu+QkhdXA2EdNATyjVnVSO2ty4UPxXBvum0aKYdMHs/2RqLIY X-Received: by 2002:a05:6402:320c:b0:46f:d71c:e732 with SMTP id g12-20020a056402320c00b0046fd71ce732mr36240872eda.31.1671383317216; Sun, 18 Dec 2022 09:08:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671383317; cv=none; d=google.com; s=arc-20160816; b=jnBRnGHpuOrYDXKVKpMQ33OuQ04KuadfFpwRRCMk3zKgraIvba5q2lvPoSSJtZDddr /57EJxRQQrzGbEhXeSgr6OLpgakCaiYZNTw/Oq3G5lhpwNpU7R7wh6VDXehWIjEKlfmg sufwts3Wq824mbWIKpRv9Lem6geonbHNxgqgKaKIpsVzjb0Lr8AiG6d6mA3OzR9/KLXt 0jrmV2Og3XR/zCNRUpkPlDWl0+oMN7ZG1gwaXVd4OxaQC1fRAREY/4GMEYWzFuKsUbAK JCdsFnsyFBOCC0OoaASPoMZHUXs0EqN6K8H+txf0NCoHCqvJSiNV56r0YhuqLlJ5rhVp VmQQ== 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; bh=rw3lO/ZAYWKYXfbWsmczOgGuAQ3KZPlAFdm3Ux1Xxb0=; b=Lbrtlh5j6yWsGJ1D3YnFH/GPiocN+WMT79/f/qREsmA3XVDtcFzp5sEO7pq+VI+FvV u4IDU2Zo9m2ey9B7mpWVsxQCjl9uSJUEcu2IZbGPAbttGijdKvVFKG9jPNevZXoFm7Ny G+qBRREWIrq36vTaLH3G7HJbKc6EZVpT6yP3dJ3wc6OQFSCpfi+tbwD7m5zqDeZ6OJxW mtL63My+m0NI0L68RU7ulAxyOjYsa6eWNCCObGCxrsM0Fo0mXc0txMSQ1GgrVuV5dvxR rv7C9qkatjkDAd4ELxyudjd1583jn9qUV2DUlSyRTV5fdc1HYLLoynvcZauMs37OYyPj xpJA== 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 nb3-20020a1709071c8300b007c082259effsi7428302ejc.101.2022.12.18.09.08.36; Sun, 18 Dec 2022 09:08:37 -0800 (PST) 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 7B18B68B752; Sun, 18 Dec 2022 19:08:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A9DC68A8D9 for ; Sun, 18 Dec 2022 19:08:27 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id E8FBC240004 for ; Sun, 18 Dec 2022 17:08:25 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Dec 2022 18:08:19 +0100 Message-Id: <20221218170823.32130-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/tiff: Check camera_calibration for 0 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: LpO5LYqZpjTH Fixes: division by 0 Fixes: 53926/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5680347889401856 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/tiff.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 41b5a6b7e4..820457fedc 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -2050,8 +2050,10 @@ again: } if (!s->use_color_matrix) { - for (i = 0; i < 3; i++) - s->premultiply[i] /= s->camera_calibration[i][i]; + for (i = 0; i < 3; i++) { + if (s->camera_calibration[i][i]) + s->premultiply[i] /= s->camera_calibration[i][i]; + } } else { for (int c = 0; c < 3; c++) { for (i = 0; i < 3; i++) {