From patchwork Wed Mar 24 00:53:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26580 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 3CF4A448F52 for ; Wed, 24 Mar 2021 02:54:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2198D68AAD0; Wed, 24 Mar 2021 02:54:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DF8868A936 for ; Wed, 24 Mar 2021 02:54:23 +0200 (EET) Received: by mail-ej1-f53.google.com with SMTP id kt15so20616994ejb.12 for ; Tue, 23 Mar 2021 17:54:23 -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:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=Z70ygljNL+927JbvTkx/NTZuEzG5LCZEZOBedNFy+pk=; b=QxCpOdu/xhyyOZNSJ3oVMZMmr+OtwtoU6twmfgRWv02IFGusBuzyHn3cYDn/rJzshN SMJbFOOXw5lx6/GjBK7WxVBT+bSTsZdKDZdhklghm99ziqAi9poyjX/b+df3ldeAqpNa a76VELVewW8odkq6ClsS7JNymW9/FKTVhWGMHQuXkmEpXWhd34RhCJIlDozvItucQ/Lb xvkAJ4P0nFJ6rDsDrRVb2Awqao3r5xJ+hI0ntc3d61oGZ6LAqk9sOtHhX5SqM7TQraFn tFaVM2xwaLbMSvLRzVd1icg+wWD+r12nTgiJrVZN6AZQ5RYHE725fzVYJ9LLUW4WD0sB c13Q== 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:reply-to:mime-version:content-transfer-encoding; bh=Z70ygljNL+927JbvTkx/NTZuEzG5LCZEZOBedNFy+pk=; b=S52yTyze6uieabDAFn2Ma5LSi5sDkHdXV9NTeZmq2nyG9DeTo1NpjXhS5Man67DOxr aSQ/7BARRzB0LVEbwkIwL0L+K4DgcXFv2GayhkxP3L8FX0CueLM8X0rH+LQWw56ZSV+/ OYbrEOw/NrUXV1orUqyMDcaikE4UcbSmLAM497YpvQrGCGs6GsAuaxa/jWafYOktX8Q/ FUEXgjddnZxUutZihOdPvUxUgXHcxADSqSD/XkDO3w3ADd5E02WFSM8Wt2m51z020gRo oPQeBfHCl/AYKIUOmmd2UTRntTBkJtaRhAnbYuEHs0q0VSqp0GuBKPKtJAtNjMmll0Oj nPoA== X-Gm-Message-State: AOAM533Ee9krvyDYZqSa5ASB0z9smUlJIG10GBZUvq78VInr5n3tYThC +RV3x5JfWg9GOwp9molkV0tIcuxrNCuUmw== X-Google-Smtp-Source: ABdhPJx2v6Rmqf/d1amdAuDv43rRH3Y9pVJpxTI9joVRhxcEP7OOuqTpihIv2F7BX2975V344mtMOg== X-Received: by 2002:a17:906:3d62:: with SMTP id r2mr868683ejf.488.1616547262892; Tue, 23 Mar 2021 17:54:22 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id m9sm162512ejo.65.2021.03.23.17.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 17:54:22 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 01:53:53 +0100 Message-Id: <20210324005354.1688230-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210324005354.1688230-1-andreas.rheinhardt@gmail.com> References: <20210324005354.1688230-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/segafilm: Remove outdated check 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The check has been added at a time when the code performed the multiplication itself instead of deferring it to av_malloc_array() and when our allocation functions used unsigned instead of size_t. Signed-off-by: Andreas Rheinhardt --- libavformat/segafilm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 1225227138..675de00ed2 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -201,8 +201,6 @@ static int film_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; film->base_clock = AV_RB32(&scratch[8]); film->sample_count = AV_RB32(&scratch[12]); - if(film->sample_count >= UINT_MAX / sizeof(film_sample)) - return -1; film->sample_table = av_malloc_array(film->sample_count, sizeof(film_sample)); if (!film->sample_table) return AVERROR(ENOMEM);