From patchwork Thu Nov 17 23:14:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39322 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1445168pzb; Thu, 17 Nov 2022 15:14:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf4mJ9e7uPKDndTGvM8f4QhSOIlOuLNYzTxfxDWyLx50DthsBjnYQNlSjpr3XNqsS1OG0FEH X-Received: by 2002:a05:6402:449b:b0:459:2b41:3922 with SMTP id er27-20020a056402449b00b004592b413922mr3990265edb.160.1668726885637; Thu, 17 Nov 2022 15:14:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668726885; cv=none; d=google.com; s=arc-20160816; b=Gp0QE6Ihv1Z1lVpTWoYs130ut2QyMak+wdhjIHqX/rAsK9mv+pTslerdMlY9lvUBrQ 1Pxt2bVLP3aOitmKWV7B3Ii2+PuWBy7GoCdclRVNH2f9zQy5z5lo3h/+MRKGQQxaIvzX M/coeTaqxxZF4r+c0pWV6+BgxVkEDg38Si5eF39817Ie1ReAk3A4Tb4UYiivagPCTuRc yq1lLMNFpcBhXd2rh5NAXDDppGDUAHdgxBQdms2sjQZIYgeyECwJBxrkDD0q3srWi2Lv Mft8ihogtgm0fqtRCCcaB9I3dRWkcp3ov3v4JAAr7nqDG4sVj8AsPJG66cZku9NXYSPA hnVw== 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=q5g50rWUqy30VfzuZxmPTXky06iBnNDGFaSj2MiTNBw=; b=IsV4qLn71n2S4BTI4i+HfnmkzFfT0QnJ5PCG4/U4f15oL2+EOEgUBgJ+l9pP39hGel E9jCDY9uX+/x+zJS6Q/PBG4Gg12CURgSJ1hPShvuO7LGtv+Wf2obvscfkTqTSV8Z80m/ IvtSGLMztjxU/esIiZPtXAV0zlIU7Hrgua5E5fOKwezP+SpOetjhjUoOmz+cCRntKXnC P6mtRobhMl0RlZ8L8ZHAW8pmiTn5WekY/adJpoz0Pj+nAKAI3O4EzIr+SyGhnzuFU1dV N1FEZgIs3f1fWl4QaMtKx9ujjyZ8WOj/NadmCcyfnqhn+fzCSHFY1/Q4jYAk9oK29KvI plTQ== 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 ae12-20020a17090725cc00b0078d48e06641si1940008ejc.393.2022.11.17.15.14.29; Thu, 17 Nov 2022 15:14:45 -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 CDC3E68BBE3; Fri, 18 Nov 2022 01:14:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF92168B8E0 for ; Fri, 18 Nov 2022 01:14:19 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id D63D5C0008 for ; Thu, 17 Nov 2022 23:14:18 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 18 Nov 2022 00:14:17 +0100 Message-Id: <20221117231418.20994-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/tiff: Avoid 0.0/0.0 in camera_xyz_coeff() 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: XeDXYkqDnexX Fixes: division by zero Fixes: 52230/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5922608915021824 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, 2 insertions(+) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 5b56892071..cde318d5e5 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1896,6 +1896,8 @@ static void camera_xyz_coeff(TiffContext *s, for (i = 0; i < 3; i++) { for (num = j = 0; j < 3; j++) num += cam2rgb[i][j]; + if (!num) + num = 1; for (j = 0; j < 3; j++) cam2rgb[i][j] /= num; s->premultiply[i] = 1.f / num; From patchwork Thu Nov 17 23:14:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39323 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1445219pzb; Thu, 17 Nov 2022 15:14:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf4eusFlfp13bZsy0Sx6eg4vJ1IX06lh2TFwN+eKA/EHKesr3E9nhr9KezDOE1OzhFJDY5CI X-Received: by 2002:a17:906:5f87:b0:78d:8cf3:6ae with SMTP id a7-20020a1709065f8700b0078d8cf306aemr3956305eju.173.1668726893513; Thu, 17 Nov 2022 15:14:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668726893; cv=none; d=google.com; s=arc-20160816; b=h2EvMo+FdsXmPYEenXUzxNXHu0LdhygIcCRAQIx0zxz23J4iHvl6CPpBYsyKMfH41C 3vW2IFcNrMop6PKfzUk3O3178HIXesVK9QprjOs3YvZZUxc3jvumFENL/dx8VkW6exX5 THSbCxEKw42/AovjC/lNb1Vd00tYxgWtbAq7imt9zstpglyOEXqD09HI1NFqu8aBcGxc 22YXIswILHDkTouQQyANcvJsGqvFFrHQGaGTQDRZOHZxMVt/VSBs6nZdH7ly62hFnFih 3+5ZCxkWKBQNLBJtjSjWfj+80BemZ0OlnOIu+lcYt7B0Hw1eKGFt2nipYXjCTPkAUnOc zj8w== 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=XAmHHiMaqcMVgtyVTPdI9senFkssaR7J/9jNcE8gCik=; b=IH40+cuqY04oe3p1GBZxwUNTEGlL3evBaWJnbRgq/flVN3MTlsduQOK9WFgW1yXg6G 4lzsdP4Lok+4Rn0oqF45tDsaF2qMBVtaTdD+0WKjacTqX+s7rJjf2Z7w4844Gxnj65Fc RdrDdbRenA87t98VygODOl1yc7RerqZdrCvnPzMmVqhAIe0S/qd5UchDX6uiygE0QAiC qOf4jV+3y8g/2zCJ/NjxGSIuHKSHqYvcHndrP50dsOa1S2EfWY86PCnl7khyffJCxVhs rtVncd48tJ07Uz5TDfn4J9kM2UlGRL89B984JBJnKxuZNq0QuCM1DoGWL9YfDuO8/+3c vCQA== 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 dp17-20020a170906c15100b0078bdbb52361si1688470ejc.209.2022.11.17.15.14.38; Thu, 17 Nov 2022 15:14:53 -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 E0CA068BC2D; Fri, 18 Nov 2022 01:14:27 +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 BCE4368BBDD for ; Fri, 18 Nov 2022 01:14:20 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id DCB7A240003 for ; Thu, 17 Nov 2022 23:14:19 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 18 Nov 2022 00:14:18 +0100 Message-Id: <20221117231418.20994-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221117231418.20994-1-michael@niedermayer.cc> References: <20221117231418.20994-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/h263dec: Avoid parsing extradata repeatedly 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: LpSv/bk/sgUi Fixes: Timeout Fixes: 52329/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-4716563886637056 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h263dec.c | 3 ++- libavcodec/mpegvideo.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 71b846ba74..4eab43d939 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -492,11 +492,12 @@ retry: } else if (CONFIG_MSMPEG4DEC && s->msmpeg4_version) { ret = ff_msmpeg4_decode_picture_header(s); } else if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) { - if (s->avctx->extradata_size && s->picture_number == 0) { + if (s->avctx->extradata_size && s->picture_number == 0 && !s->extradata_parsed) { GetBitContext gb; if (init_get_bits8(&gb, s->avctx->extradata, s->avctx->extradata_size) >= 0 ) ff_mpeg4_decode_picture_header(avctx->priv_data, &gb, 1, 0); + s->extradata_parsed = 1; } ret = ff_mpeg4_decode_picture_header(avctx->priv_data, &s->gb, 0, 0); } else if (CONFIG_H263I_DECODER && s->codec_id == AV_CODEC_ID_H263I) { diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index ccec0dd75f..6440b906b1 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -117,6 +117,7 @@ typedef struct MpegEncContext { int input_picture_number; ///< used to set pic->display_picture_number, should not be used for/by anything else int coded_picture_number; ///< used to set pic->coded_picture_number, should not be used for/by anything else int picture_number; //FIXME remove, unclear definition + int extradata_parsed; int picture_in_gop_number; ///< 0-> first pic in gop, ... int mb_width, mb_height; ///< number of MBs horizontally & vertically int mb_stride; ///< mb_width+1 used for some arrays to allow simple addressing of left & top MBs without sig11