From patchwork Wed Mar 24 00:53:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26579 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 18F7944B30D for ; Wed, 24 Mar 2021 02:54:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DAC7168AA90; Wed, 24 Mar 2021 02:54:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47D4168A8F8 for ; Wed, 24 Mar 2021 02:54:04 +0200 (EET) Received: by mail-ed1-f52.google.com with SMTP id b16so25678882eds.7 for ; Tue, 23 Mar 2021 17:54:04 -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:reply-to:mime-version :content-transfer-encoding; bh=aXYsUh/sEKFaxuG90mUs5RYs1P4BLXNCVTPnNTlVthk=; b=bLvl5/+SGaJp2nHjkpCfJ+zljX0o5c67Iq+2OfvfncoWkZej2lkj9wPbGtviZnTjDw z15Vo3xhU03rWURoUZGCKMFSc6lZByGIIKRwk3baUnDP6uN9oAs6u+d9UTNZVzU89V+v ako35tpvj/ghQ9opij1RR0EWmwkuHhCw8RNhffi6yqbmyOHtyeE5rn+OJo9A9AS97Khw fzV8675BBTFuHjsF565rtlvQcz9BInXjCnlT3PsFEzgUc+fIWWBQ1uQD70Mcc9o9Gdzs iMUbf/D/Jq3Cn2FVSgakMkexu0KcvyX2VoYcKOibGJLMX+RQEFRI7pKXRGD1gcMPoIRE xdFg== 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:reply-to :mime-version:content-transfer-encoding; bh=aXYsUh/sEKFaxuG90mUs5RYs1P4BLXNCVTPnNTlVthk=; b=l0+BmHKkahm6xMyORLHJr2WmilNZtzryCPVm9D3ypGyFc3r3scPR+JRC/NlBszJ37H +fIcx1r6Nrm1JUycstXzUM6EsTB+riK0r85oe5up8TCQoAsulx6eVm9uYeQtg4aGAHCT EYq8L8VoAzPwoklZTWRJuxx2K1FY7Pxh8Ks8BE4biPVwG+zN/QveRJD7Az6C3Tp28Eux ThVPl//JqvmrCL6jrURNRNhkMC5kLWLeFYbfrBFFyNEvjkekY9N+61m41rJSjuyho8uX 3Uxqd1ElI/MHUCPGoAg7aa8GIl7oN3l6ySEEL5Ttl4tdN4qq2Zhn+6DgZVn1YcZb34AM Y/Ew== X-Gm-Message-State: AOAM531+vaa/31lBT3KkrAhVDqSwSefRUiVgXotiDI3Y95T/8LQB2O6D ooPvZ2vv3slwKpDYOTcXxcvw3o8elRmoHQ== X-Google-Smtp-Source: ABdhPJywx5x2IOdUo5TT6NVyYNt3s6y7U3TMMKnpylc0agvmjoZ/PBxTFj3c4JC8uGZlTzAezeuftg== X-Received: by 2002:aa7:db95:: with SMTP id u21mr622293edt.152.1616547243498; Tue, 23 Mar 2021 17:54:03 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 17:54:02 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 01:53:52 +0100 Message-Id: <20210324005354.1688230-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/utils: Remove redundant 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" This check is outdated because the caller doesn't need to check that the multiplication overflows when using av_realloc_array() (the code in question used av_realloc() before that); furthermore, the check is also a remnant of the time in which our allocation functions didn't use size_t parameters. Signed-off-by: Andreas Rheinhardt --- It would btw make more sense for AVFormatContext.max_streams to be unsigned. libavformat/utils.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 524765aeb4..88f6f18f1f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4493,9 +4493,10 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c) int i; AVStream **streams; - if (s->nb_streams >= FFMIN(s->max_streams, INT_MAX/sizeof(*streams))) { - if (s->max_streams < INT_MAX/sizeof(*streams)) - av_log(s, AV_LOG_ERROR, "Number of streams exceeds max_streams parameter (%d), see the documentation if you wish to increase it\n", s->max_streams); + if (s->nb_streams >= s->max_streams) { + av_log(s, AV_LOG_ERROR, "Number of streams exceeds max_streams parameter" + " (%d), see the documentation if you wish to increase it\n", + s->max_streams); return NULL; } streams = av_realloc_array(s->streams, s->nb_streams + 1, sizeof(*streams));