From patchwork Fri Dec 17 21:51:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32697 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1993397iog; Fri, 17 Dec 2021 13:53:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJx6mlQOFfcCXRxaO78Y6xfVtguP/SvSDAuc12FvBwK9CUsDS+mXgXbdAYiMhaaJtLAQiAxp X-Received: by 2002:a17:906:82c4:: with SMTP id a4mr2924619ejy.23.1639777995352; Fri, 17 Dec 2021 13:53:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639777995; cv=none; d=google.com; s=arc-20160816; b=eZYtd9QW6PyoBgPol+Qf57rqKMGMY4rNF5NNG9T72Nak2yoqkHfuw/hHhjqGXjKBEA dLsHb3wMGgAKsItGVP2EJC2rlX49IS24a4bHvmYqGqy8cnKc2kws3RDk/8ZUZVlXD7NY UFE6+crnfv2Q+0zNaDBi7fCLSZcZO6K8eL5z9BT/Cp/tmQcXmZ8HFKk3OSU2ohGsp0NN mvZnvaSZYGz/6vFPo4xyAltRpZiRHgoJ6ML0Qyg24EY5okeyPdvGa4a9pH6o68k3+5gW vYn219aBgTzZuwlFO/rsZ5nyXRMZgc0Kw7CqXqyYeKHqLlJ4gU7wJBPkei+F9PaGdtQr 8HAA== 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=A8c1jRUVVTsiHH7wk3/PQOzLh8XM1aV7x/WDFIK/2ac=; b=KCUkCoobG3nBPqjLGGzohYGJTtRDDcONT0sP/ClyPQ9lD/lto68ia1dZRFXa8Udo+8 fZbTHbRIMGAO56wxsTY5zFAiZa9DOvVTayQleKpR2WNxfx0lJkTyd8HgOPPWo70YTRRN ndc5V1ZMVdvP+Ulfs+3s3FkiG3SHgfUBFTrYFxO5rzef6i72StJAQtwrIBOwf1oUbQRQ 1F75E4dtcVjCOfkEDew4SUcrZNECL1F5r6baCVcdebIbul4W+kWDq0m+G7+H4LrXPeuN KhcmX3jQI7wQ66uAUeyB37+f7OV2tfQ07B9AGy1qzAN7dTSjgp1djUBuexomYmzX46BM bxrg== 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 v13si1376527edq.6.2021.12.17.13.53.15; Fri, 17 Dec 2021 13:53:15 -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 AFD1768AEBA; Fri, 17 Dec 2021 23:53:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-2.mx.upcmail.net (vie01a-dmta-pe02-2.mx.upcmail.net [62.179.121.158]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C963268AE80 for ; Fri, 17 Dec 2021 23:52:56 +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 1myL9s-00Bdj8-0H for ffmpeg-devel@ffmpeg.org; Fri, 17 Dec 2021 22:52:56 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id yL8umhDwgSgGFyL8umiq3c; Fri, 17 Dec 2021 22:51:56 +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=f8Q2+96M 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=NEAV23lmAAAA:8 a=G6b7F1W_FE-z611kPGIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 17 Dec 2021 22:51:55 +0100 Message-Id: <20211217215155.19805-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211217215155.19805-1-michael@niedermayer.cc> References: <20211217215155.19805-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMAoYyTrjuUg7QHZnG9okvJUHGZLH2I1zraPZsKMnDCTFwTa4dg4qsVu2oZdPzjaPfOCL9Z6UcviVoSB8SmK+F+hK54Fd/yt9Hedh5bqFEmuESuHcz1T 5JzUbxFetGrhAfo6f/DY7eLw7e2h3E/2ZbYQ17OiPwnIzo2hs5hxWSmp Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/tiff: Use ff_set_dimensions() for setting up mjpeg context dimensions 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: ij6IOsv/ekP7 Fixes: OOM Fixes: 42263/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5653333619113984 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/tiff.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 9af602eef70..60773d59ed0 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -724,13 +724,14 @@ static int dng_decode_jpeg(AVCodecContext *avctx, AVFrame *frame, static int dng_decode_strip(AVCodecContext *avctx, AVFrame *frame) { TiffContext *s = avctx->priv_data; + int ret = ff_set_dimensions(s->avctx_mjpeg, s->width, s->height); + + if (ret < 0) + return ret; s->jpgframe->width = s->width; s->jpgframe->height = s->height; - s->avctx_mjpeg->width = s->width; - s->avctx_mjpeg->height = s->height; - return dng_decode_jpeg(avctx, frame, s->stripsize, 0, 0, s->width, s->height); } @@ -971,14 +972,14 @@ static int dng_decode_tiles(AVCodecContext *avctx, AVFrame *frame, int has_width_leftover, has_height_leftover; int tile_x = 0, tile_y = 0; int pos_x = 0, pos_y = 0; - int ret; + int ret = ff_set_dimensions(s->avctx_mjpeg, s->tile_width, s->tile_length); + + if (ret < 0) + return ret; s->jpgframe->width = s->tile_width; s->jpgframe->height = s->tile_length; - s->avctx_mjpeg->width = s->tile_width; - s->avctx_mjpeg->height = s->tile_length; - has_width_leftover = (s->width % s->tile_width != 0); has_height_leftover = (s->height % s->tile_length != 0);