From patchwork Sun Feb 14 16:41:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 25621 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 C77A5449186 for ; Sun, 14 Feb 2021 19:10:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 961756880B2; Sun, 14 Feb 2021 19:10:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 174C66807F6 for ; Sun, 14 Feb 2021 19:10:35 +0200 (EET) Received: by mail-io1-f44.google.com with SMTP id u20so4517680iot.9 for ; Sun, 14 Feb 2021 09:10:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lwta1wEzdHmnzTA+BE1Gf6+/eH+c/EuFQYQ82kFlMuE=; b=NEsKSv72ORQWK/zNcBf/rxMU2o8TCnkkOxvUEPXw1WyR0eLs9Ygd4Db/SkoM2YnqtY 8G10kkqaFM8KIXEMnu3o+8l1WxrHbjLaIio6C7cE5mjOW76WH1VeRKXLK67LZybGh9Br m4jo201kVQp0md93UC625rvL+ZMscx3dsaidP7JNKXvwfi1I1vhb0KdzD+0eAFWd/0Zj sqgyaDKVU65uavbMjyVdXXzPTuP1AMYRTmEr7LTnV9YlZzBxQIsvcXK/ToKfe2YL+H5b PK/svh3fMzAaYsrn4xCaBSEcHYson5kRgfQlV5fXcsHKmQn8egwh02ydt7Zc004jfsJi wmig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lwta1wEzdHmnzTA+BE1Gf6+/eH+c/EuFQYQ82kFlMuE=; b=Tk8bGZwhX20T5Hk/SaY8UX+LBLXTCScmGc37bOkQIb8T+p4g+rlnjFoNAQ8zfGq13g Y62QSWx8Opm2lwdHYi8ewAfsrZifJJYHZX2Gxsupfz4+Nk6AjRZXgAM1o4mbRF/JKoXN p8+KfIliBwsMuCX0OiddeksYTLC6Wu/J6/fP+0WQLWb0DiW/edPbB7zT0DmT88dRop8V fYgAvDiEvwDCJZNZcDKxzvRoBaoO1B161vQfCpGPmCHCAiaVcPa0BIh6cQZ8DJwSuyeI 9RTY/ix2xgvPYQu/1WoxvDIcDpj43qcmEY5oyaJKIF6Yfm/cjsGRryHUrXy1xi8FiONl TR4A== X-Gm-Message-State: AOAM530nMLdGMp1CWeefkAsuOOgUbcbGTWBypDynSjmS7Ow7YrzqD7vT BePDrxlGirZBxCDE0I7394jptuIbruA= X-Google-Smtp-Source: ABdhPJzEKXIV5Y0qOr9XRLWxU5Xu/IjDoxlH0hDNpFJvrPFe8UAhdvraUhoKygSqEKq+Y6FPj1h2GQ== X-Received: by 2002:a63:e442:: with SMTP id i2mr11544298pgk.12.1613320909663; Sun, 14 Feb 2021 08:41:49 -0800 (PST) Received: from Nuomi.localdomain (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id b14sm5923658pji.14.2021.02.14.08.41.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Feb 2021 08:41:49 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Feb 2021 00:41:21 +0800 Message-Id: <20210214164121.30100-1-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <161329906302.22435.17923509830312328011@lain.red.khirnov.net> References: <161329906302.22435.17923509830312328011@lain.red.khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avutils/video_enc_params: fix type-limits compile warning on 64 bits build system 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 Cc: Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This will fix following compile warning: libavutil/video_enc_params.c: In function ‘av_video_enc_params_alloc: libavutil/video_enc_params.c:36:19: warning: comparison is always false due to limited range of data type [-Wtype-limits] 36 | if (nb_blocks > SIZE_MAX / sizeof(AVVideoBlockParams) || | ^ --- libavutil/video_enc_params.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavutil/video_enc_params.c b/libavutil/video_enc_params.c index c46c0f1dc6..2606b5589a 100644 --- a/libavutil/video_enc_params.c +++ b/libavutil/video_enc_params.c @@ -33,7 +33,11 @@ AVVideoEncParams *av_video_enc_params_alloc(enum AVVideoEncParamsType type, size_t size; size = sizeof(*par); - if (nb_blocks > SIZE_MAX / sizeof(AVVideoBlockParams) || + if ( +#if SIZE_MAX <= UINT_MAX + //check the overflow + nb_blocks > SIZE_MAX / sizeof(AVVideoBlockParams) || +#endif nb_blocks * sizeof(AVVideoBlockParams) > SIZE_MAX - size) return NULL; size += sizeof(AVVideoBlockParams) * nb_blocks;