From patchwork Tue Sep 14 09:46:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 30237 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4824017iov; Tue, 14 Sep 2021 02:47:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2oGVYjvs+PLKCk5TcHgRyFKuRW8Nbyy5w42+goABK1a3DvVxIbOyRa6SI58XYmPtXXmRn X-Received: by 2002:a17:907:c23:: with SMTP id ga35mr17251229ejc.203.1631612864577; Tue, 14 Sep 2021 02:47:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631612864; cv=none; d=google.com; s=arc-20160816; b=vI4BZFmCFUEkh+88nerh+Nd/Qsso0tPSzgYquONJ3gTtikkhpu9+BKHDmZcSKhiqIH GBolxYy9ApTkL81qHgGOL98j1Y+Sc+nSpKnJeM7eygCQvc30bsDw9cFf6DWrzKsmWgIe 4J0QBDkjdCsC8/vv5BEEqfQ0/MrfNgGh4R+OdR+FxD0vPWWKh0aOKi+ztKUToYmZzwon LF7EXNQYz1w6gfPiZa5fvMa4TfTHssvIkItbdpFYr1ZXXoQ4D9SjyBSWcBuQ1XF8N6HW l+0HDZnGBdIU6VE62HuVgweDF2M3rrqrf6uqIgC7mnCjs5GoTWn80OKI/a7bdLL/sk9h MQpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:mime-version:message-id:date :to:from:delivered-to; bh=ecPXVrfnC0fZpPEBo6xk8CJJF2fQL6wyT0SxO/dyiwU=; b=qU9uezudRKNEbiriSYKgLhC/y/fs0tWeHGbNcoqablgLBM7rbVTwuTp2Z+BdQTKPQF ay8Nfwws55bEMFieQgTqP+eZmShjwvC9BzTq0TJlKsIJoMtJ6HhJ+HVhg9LBL8TAvf82 7Ub3uHm7b+nSKq1fKuKjS5MYBXUA3/VtbeBCkENKFoR8YGM8U0kJjfOIST9e8jHLgcaI Kx0PdV0VyDpmiBpp7laabitl27vB8zRiidYI5jsw6HTt3X/CQbAs6TqY3kwErdKw0kqi F+v+820v7iivF6byUmkg2uB2ErBBUU8QSPRAOTiVjD4Iwm6uVjrz4x9r/vM1pLtBhv65 9evg== 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 my37si4571688ejc.631.2021.09.14.02.47.43; Tue, 14 Sep 2021 02:47:44 -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 CE31B68AEF7; Tue, 14 Sep 2021 12:47:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg604.qq.com (smtpbg604.qq.com [59.36.128.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F50A68AE84 for ; Tue, 14 Sep 2021 12:47:31 +0300 (EEST) X-QQ-mid: bizesmtp39t1631612776t6ikrnqs Received: from localhost (unknown [103.107.216.230]) by esmtp6.qq.com (ESMTP) with id ; Tue, 14 Sep 2021 17:46:16 +0800 (CST) X-QQ-SSF: 01100000002000Z0Z000B00A0000000 X-QQ-FEAT: iQygIJK8D+fe1LLxRZgqz9P23RBky/VN+CUoDlvHStRYdEQkf4/28ZEhlugNP UNTNgEWJhSikALUWNAqsuqx2uSBhbMQ1e1lKsiqdNtTJtCnXI2pHlD+kv1f+MkLcT8EJkQY fD8vPN04Bt0+/JMNG7lJSNqJiguUDITPK6D3SF0rJiQdt/g30yxoxfylAosVRQMEB5dHXtR lYRUeHrLIs+Q3tfuZBbvVv5ezprjCofkhb7/EGsDyJHX2O/zP1Q/sj90rUpmePaySF5zxZd i5M8OGolAElE46LgsanDfmoEGuZ7nR6GHr8y5WcwzchNrXxie8wdX7R/b90VTHgf4B9A== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 17:46:14 +0800 Message-Id: <20210914094614.34720-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgspam:qybgspam4 Subject: [FFmpeg-devel] [PATCH] avutil/imgutils: use INT64_MAX for check stride and stride*(uint64_t)(h+128) 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 Cc: Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uk8a+0hflg8p look into the Picture size condition using INT_MAX is smaller, so make it to INT64_MAX maybe large enough for Picture. before patch: [mjpeg @ 0x619000004b80] [IMGUTILS @ 0x7ffee7e71210] Picture size 15748x23622 is invalid [image2 @ 0x616000000680] decoding for stream 0 failed [image2 @ 0x616000000680] Could not find codec parameters for stream 0 (Video: mjpeg (Baseline), none(bt470bg/unknown/unknown)): unspecified size Consider increasing the value for the 'analyzeduration' (0) and 'probesize' (5000000) options Input #0, image2, from '/Users/liuqi/kuaishou/Test/docs/image.jpeg': Duration: 00:00:00.04, start: 0.000000, bitrate: 8995854 kb/s after patch: Input #0, image2, from '/Users/liuqi/kuaishou/Test/docs/image.jpeg': Duration: 00:00:00.04, start: 0.000000, bitrate: 8995854 kb/s Stream #0:0: Video: mjpeg (Baseline), yuvj420p(pc, bt470bg/unknown/unknown), 15748x23622 [SAR 200:200 DAR 2:3], 25 fps, 25 tbr, 25 tbn Signed-off-by: Steven Liu --- libavutil/imgutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 9ab5757cf6..03abf1cece 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -298,7 +298,7 @@ int av_image_check_size2(unsigned int w, unsigned int h, int64_t max_pixels, enu stride = 8LL*w; stride += 128*8; - if ((int)w<=0 || (int)h<=0 || stride >= INT_MAX || stride*(uint64_t)(h+128) >= INT_MAX) { + if ((int)w<=0 || (int)h<=0 || stride >= INT64_MAX || stride*(uint64_t)(h+128) >= INT64_MAX) { av_log(&imgutils, AV_LOG_ERROR, "Picture size %ux%u is invalid\n", w, h); return AVERROR(EINVAL); }