From patchwork Sun Feb 14 06:27:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 25611 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 60A0F44B2A8 for ; Sun, 14 Feb 2021 08:53:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 365C5688385; Sun, 14 Feb 2021 08:53:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f171.google.com (mail-vk1-f171.google.com [209.85.221.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9F5E680C9A for ; Sun, 14 Feb 2021 08:53:22 +0200 (EET) Received: by mail-vk1-f171.google.com with SMTP id v66so861208vkd.10 for ; Sat, 13 Feb 2021 22:53:22 -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=Cl/HEDokwOud9MUUtlaOKqEax01VZf1OFRPzsCTGDGE=; b=r27lDNvIrFvkvhh2JqZ34EQ/u7lUJbqqBZgWK8nGRfr5NkR+RyURRTqhNRmucIbBaW eAc6p+pTVEz/Rpqvsc/01Lk1inkxgz14vOTZv1dvLTyiy+TypSoZZMFpdqIK4/dTZeNq USbb8H3MSgvqc06yYpvLhZ3VxdzSvcbDeCKFbQP81kLYOoXsWH2gMUV/Bi/rZ1zdpoN+ wRnaddeqKKby8VOYGBA458Ji/MLywL3GysPWkaGxJ5yA/+eft6CDG0h8pmYF1VvHOYLH thpl5Y1N8xWQjl0CExKvi9Ja0knipIkviFOMl+62QXybyxXzop+CRBoFD3GFBE00fnZ/ ZEPw== 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=Cl/HEDokwOud9MUUtlaOKqEax01VZf1OFRPzsCTGDGE=; b=mO8sgZzE/law33sgm9J/X8hgRxTGmEtkPHFLZVkkrPUnCIGQntK/x/cW6hS5Ajgcj8 5CIsyIogjk2etqcPhlG0wRq9c9gUqxNBMnXmJIjzOTLYRjVZxMPrnHE8m9bE5d2VIL3r xBjxPNUXQicR2EKRjW5dQtZOXL4x1ckySjwb59pMWrythhT4jseQ2dPKa1KWfEW6bhfT QMVbyGT8vffK0UlygjwtxY+DG1+EGqy9c4GBA9oluSwz1lNo2GW7g264zjjxG4BahI44 vUN3rcY28Fca/Vvz7e6tvLGzqoCMsB3Wrq5FcGhXLsd98r/xxEtBGL5watDjIbJDE8Lx pZnw== X-Gm-Message-State: AOAM530Q/edTwfwWXmDXmwVQpDwWkH4AUaM2MLmjFgustmKc6e67LOaP L4uDDhGkAkvPLyBQ9OcCpv3nb7ANB58= X-Google-Smtp-Source: ABdhPJwwSY4K/ZbzoUYb8LJGeH3oi8LX0VWV+TNV+6/z7doDMAo84NdOeqfafGJoFPKMHOUijuG1Pw== X-Received: by 2002:a05:6a00:1507:b029:1e4:d81:5586 with SMTP id q7-20020a056a001507b02901e40d815586mr10466693pfu.53.1613284074901; Sat, 13 Feb 2021 22:27:54 -0800 (PST) Received: from Nuomi.localdomain (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id j1sm3515430pjf.26.2021.02.13.22.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Feb 2021 22:27:54 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 14 Feb 2021 14:27:39 +0800 Message-Id: <20210214062739.28181-1-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/movtextenc: fix compile warning for type-limits 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" CC libavcodec/mpegaudiodec_common.o libavcodec/movtextenc.c: In function ‘mov_text_style_start’: libavcodec/movtextenc.c:358:26: warning: comparison is always false due to limited range of data type [-Wtype-limits] 358 | if (s->count + 1 > SIZE_MAX / sizeof(*s->style_attributes) || --- libavcodec/movtextenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 1bef21e0b9..cd0e43a79b 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -355,7 +355,7 @@ static int mov_text_style_start(MovTextContext *s) StyleBox *tmp; // last style != defaults, end the style entry and start a new one - if (s->count + 1 > SIZE_MAX / sizeof(*s->style_attributes) || + if ((s->count + 1) * sizeof(*s->style_attributes) > SIZE_MAX || !(tmp = av_fast_realloc(s->style_attributes, &s->style_attributes_bytes_allocated, (s->count + 1) * sizeof(*s->style_attributes)))) {