From patchwork Sun Feb 14 06:26:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 25612 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 D2BFC44A461 for ; Sun, 14 Feb 2021 08:57:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB8026891F1; Sun, 14 Feb 2021 08:57:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80E436880FF for ; Sun, 14 Feb 2021 08:57:53 +0200 (EET) Received: by mail-oi1-f174.google.com with SMTP id r75so4484766oie.11 for ; Sat, 13 Feb 2021 22:57:53 -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:mime-version :content-transfer-encoding; bh=0nMjmp2uFlY2iWLaHCplmMmU9GBnINP5j9DlSFrDd7g=; b=QTWg8iHq0iel8LIaG2PuIAupKDSW/bGljPto45QwMNF/6unYUSnpR6+IWlRtI4+DFu c90kFsZJs8oVLY8G57DXTNmR4ip8EVGUh5/w/GeFOpupinCyaMhWE0fll4HzCXMGeZS0 IbvB+9vcN1hid8dXumOxIIDGVdG8tSh6x6DoaV1NYaTYXPMCZuXyXQMB4235OK5t7l5I oUV6N6cgQvoaMfT27poGvFYT2D7GKO5+uetA0ynABeKtV0LjgNrjDNE/4PZJYAAhEWxB poODaZq3hwOtAeYyQutxrwhhtelZCP4RJX+xbpCkO0dTP1VxnQgoeHB2KtNP7YfR/5VH faMQ== 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:mime-version :content-transfer-encoding; bh=0nMjmp2uFlY2iWLaHCplmMmU9GBnINP5j9DlSFrDd7g=; b=LV+lyvJojw1Ocb1KOFCD09Xqv8DWUtI8tALdcRiu4NLJ+l355uYenduS7LwxCe05ON qwSRdInGof0ExvPhXModzhTlF0v/Lluqzr5xbM3n+/BCjDgJIdLf+GAwcEpB6m0SpDY2 Gg/f5wm/Vcpixdm4QsVSouBz2xtAsY43n5e+DzsTnOYzYpMRQZN0l1/HpLhnCTVrrP0/ TrGj3fIf2aT8Bdl7mQYWDPHpC7VJJ5OKIF7mg3bBi+yq9pQJzWY4qPSp9yulTHhgbD9x HoAvYzbgJIWgmR4FkRU6YJmpX9JOsl+/quZpgGTKcK6szhctXuhAx4Gnbrad9e9TrFhM Anng== X-Gm-Message-State: AOAM532+AzHFinz/TJyVz4zArQavnf5IatH2R72HjC/r8XbXyj3CIOWf YkkOaYbdDESmLlRxiH4V74FuBpkvyAQ= X-Google-Smtp-Source: ABdhPJzJhXSuWMQbCpmmp7jVhU/ytA3isjVEXVkPU475uQbp5eEjpK6xuvH5VnEp5YEIRyeJPdpIlg== X-Received: by 2002:a17:90a:b282:: with SMTP id c2mr10450684pjr.54.1613284040793; Sat, 13 Feb 2021 22:27:20 -0800 (PST) Received: from Nuomi.localdomain (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id z11sm13131226pjn.5.2021.02.13.22.27.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Feb 2021 22:27:20 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 14 Feb 2021 14:26:56 +0800 Message-Id: <20210214062656.27221-1-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutils/video_enc_params: remove unnecessary check to fix compile warning 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) || | ^ Suppose a is "nb_blocks > SIZE_MAX / sizeof(AVVideoBlockParams))" b is "nb_blocks * sizeof(AVVideoBlockParams) > SIZE_MAX - sizw" If a is true, b is true. If a is false, the expression depends on b. No matter a is true or not, it we only need check b. --- libavutil/video_enc_params.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavutil/video_enc_params.c b/libavutil/video_enc_params.c index c46c0f1dc6..31bce6a277 100644 --- a/libavutil/video_enc_params.c +++ b/libavutil/video_enc_params.c @@ -33,8 +33,7 @@ AVVideoEncParams *av_video_enc_params_alloc(enum AVVideoEncParamsType type, size_t size; size = sizeof(*par); - if (nb_blocks > SIZE_MAX / sizeof(AVVideoBlockParams) || - nb_blocks * sizeof(AVVideoBlockParams) > SIZE_MAX - size) + if (nb_blocks * sizeof(AVVideoBlockParams) > SIZE_MAX - size) return NULL; size += sizeof(AVVideoBlockParams) * nb_blocks;