From patchwork Wed Mar 24 00:53:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26581 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 36EFB448F52 for ; Wed, 24 Mar 2021 02:54:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1CBB668AB27; Wed, 24 Mar 2021 02:54:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54F2868A936 for ; Wed, 24 Mar 2021 02:54:24 +0200 (EET) Received: by mail-ej1-f49.google.com with SMTP id k10so30127114ejg.0 for ; Tue, 23 Mar 2021 17:54:24 -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=1CLV4VForBD6yiJ/g2EF5vRQ/VdohmZThFgZanch730=; b=WQa+25lIkyIVyTZFvt5IAH4c+MSTGQzYI2YASBrx4cNXIwHS7pEd1VwLcqnZg3HTVb ChHWgm7Zung8kPhzLjYK3/eFxF46spI9t5gHZL3daKWdko0YwH48ZcHxNU2/FWIzR1UZ FkNzg9BEchGfHIT6RGVRIqexUzs76BP+67qBWMG7yVGkmK7e+x0zBjwJzzb98ucZl/Mm TEkIhziFigvGDT1y6anajWbC/A7XlHX0HCLxJnbb1AbXpavUZg9U+yA/v4FLM5yCDWaQ MxZ5Wrz39xcfESjYyqw2GP5BfABW9P8tRACUH2soatLyAhTLu01OoW7W71NUJUgHL6dR N5Xg== 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=1CLV4VForBD6yiJ/g2EF5vRQ/VdohmZThFgZanch730=; b=m7pb0xNM4WHDN/W+jA58cs3vr4iI2hDIra5A4vaHAClFmZ6DToFQEigadgmgUPz5F0 yF/kMMkEvFW5xOPc8ZYw4bJEXHT7nFwGp+r3N1TKBXGpxfHzCNzE0uP/4LZr6VrDeUF6 U/SqmwjQCP3oyV/5buv0h5qVjyRBS8amHbIW2ZAAq4moyxObbZ+aScnmliQ1WolBzqJ7 SrKsnZzpGpR0JfYccm5urNoXsPL1gLYzclRCmMoxmCNb/E7nzRPM/KoOQj/EdT/Q3u/y H/ak6f5MXLuP3syNC6f5ejSZpE2d6DAWcVyahtT10Y0yBhYG/ISNrQQCytkqp9Qc2C/G O1DA== X-Gm-Message-State: AOAM532dcuXDqYz1YE3eLFbRcn4rZR9RJVIBkoeVtBt9ZQmPpEpIfxiM mMfqxGQPsIPXg23XSCcqJl1roK/VfUb8RQ== X-Google-Smtp-Source: ABdhPJzN6SCIal+bXqkc45GdPdgkiex1uhJf4TNi0d1lquVv+1U3V/xPH40XCAxg1hxMAa+DJYBE2A== X-Received: by 2002:a17:906:354a:: with SMTP id s10mr878068eja.21.1616547263690; Tue, 23 Mar 2021 17:54:23 -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:23 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 01:53:54 +0100 Message-Id: <20210324005354.1688230-3-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 3/3] avformat/sierravmd: 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/sierravmd.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index 40bcb77986..11a883614f 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -186,10 +186,6 @@ static int vmd_read_header(AVFormatContext *s) vmd->frame_table = NULL; sound_buffers = AV_RL16(&vmd->vmd_header[808]); raw_frame_table_size = vmd->frame_count * 6; - if(vmd->frame_count * vmd->frames_per_block >= UINT_MAX / sizeof(vmd_frame) - sound_buffers){ - av_log(s, AV_LOG_ERROR, "vmd->frame_count * vmd->frames_per_block too large\n"); - return -1; - } raw_frame_table = av_malloc(raw_frame_table_size); vmd->frame_table = av_malloc_array(vmd->frame_count * vmd->frames_per_block + sound_buffers, sizeof(vmd_frame)); if (!raw_frame_table || !vmd->frame_table) {