From patchwork Thu May 21 14:21:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19795 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 15F4F44A559 for ; Thu, 21 May 2020 17:21:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB7B668AB65; Thu, 21 May 2020 17:21:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62EC96805A2 for ; Thu, 21 May 2020 17:21:22 +0300 (EEST) Received: by mail-pj1-f65.google.com with SMTP id s69so3134437pjb.4 for ; Thu, 21 May 2020 07:21:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=rWlZp07EAXuuN1rQCM1OdaFlM5JF3ouQBBNUxyThjhU=; b=nMLaRYymk15pS2V79ezhgoeubWlpp9E/7F85W+YHJ5OZGgBgmqhfabR003ksVKIT4C TkUiuMzA1dWObRZHRG0lOY6TxjFWuZnGybnXbruPwvpQeObcY96FP26sQhyUKlLr1T4D SxfJ1RB5W4FQwkxcbRwrx+PSWxqO6jhMt8FGmbEBlViruB67iF/7XuvHz7Xi/E81QCx9 aBYt7dOd6Si85gfCYj2CZbh+DCl0FO4zbRJAOKNoNQKgC+liOmno+18PTmnOuz+H2D+a Y/AOVE/ZKWmYhMCoXCS40ps9RZpe81O72GhsTrFLrjlGHwcLjYgdOYm2cPDZiDhIfcw8 TtRw== 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; bh=rWlZp07EAXuuN1rQCM1OdaFlM5JF3ouQBBNUxyThjhU=; b=FucIjzAcsS6ds75RHv99y5rOrRxs6XbAGiCb2Pnp4c9JDimNJRcpRvS0U3oEfChuXP 2rNjE18wDZ5a3qbY7GvPxUkdHU79+BoIQwu9EFaftsMLC9OAjtTCim5oYvbFSrOzdezq 4+cbW9s4bo2h4VMymRDfy1rLSyrddqAeReSVL177SGZgH2bCi7K66wPmnL56Pi8KUGz8 nAVP4ZpiOub5xGW8U5/W/QH8MCLk5JYMkfHEYXotY0L06XTpMcG2FWv9qAO6cDzhwnqO 0+ZedgDA+dKtXSmmrgbDOQjvFZrB2YIO0VxGIL7ghwO2ekIZTZ21PpEGdKTZ2WzdaUHY zniA== X-Gm-Message-State: AOAM5332SbI1KyDoHDru4lyeqwYhsIwLwY7rVsOCOzEtaOAE7xjlAwWC VXJDAqe+pJd45Obc5o/KMidfSC4x X-Google-Smtp-Source: ABdhPJzgXCp01UgyzeXrzORXsuxDmpQFirzI3fzbsI7JMP0TkR06A3WQn8Y1G1ra9S2GUgKXCVIPeg== X-Received: by 2002:a17:902:c254:: with SMTP id 20mr9815621plg.287.1590070880544; Thu, 21 May 2020 07:21:20 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id gx21sm4560411pjb.47.2020.05.21.07.21.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 May 2020 07:21:19 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 May 2020 22:21:14 +0800 Message-Id: <1590070874-8135-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] avutil/video_enc_param: fix 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang warning: comparison is always false due to limited range of data type [-Wtype-limits] Also nb_blocks is unsigned int, so nb_blocks * sizeof(AVVideoBlockParams) may overflow, so force to size_t Signed-off-by: Limin Wang --- libavutil/video_enc_params.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/video_enc_params.c b/libavutil/video_enc_params.c index c46c0f1..4a4c85f 100644 --- a/libavutil/video_enc_params.c +++ b/libavutil/video_enc_params.c @@ -33,8 +33,8 @@ 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 > UINT_MAX / sizeof(AVVideoBlockParams) || + (size_t)nb_blocks * sizeof(AVVideoBlockParams) > SIZE_MAX - size) return NULL; size += sizeof(AVVideoBlockParams) * nb_blocks;