From patchwork Tue Sep 24 16:31:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15260 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 88712448676 for ; Tue, 24 Sep 2019 19:37:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E9A6689E39; Tue, 24 Sep 2019 19:37:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1288C6881CB for ; Tue, 24 Sep 2019 19:37:06 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id l11so2702587wrx.5 for ; Tue, 24 Sep 2019 09:37:06 -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 :mime-version:content-transfer-encoding; bh=L6GejYBG65KQ6HaGqU7+rFM586lAvHg00o3+YZf3TVI=; b=GA6t+18V2GGFeyYRPcMyOMc917eOa5CAgTj55AUdlQzjcKyomvEfaoI3qIGrcbfznj czJeh/FdZH/BxiLMF1UqwByIDmoN35O6KxAU07WogVv+PJGaZMsc/U16hxi92+diyeDI cQQ3GESh3/s8gnHw8TIL7gfk45lkq3ictvyNPkStP6MaG1jbTw3jIFajdmVRtGBUu9jD YHKYyVc3Jl3fSWkjGglDfEBbI1xtgymcqRCNBC+/PSUyl20c2rMtjromEW7JDxTVJXoW Ygazl2bD8PTYi2Nz4p5jlAfEj+RkYFwX0mPnlHKV359PDyynwvgkmYRGc1amNsXklcvg KEOg== 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:mime-version:content-transfer-encoding; bh=L6GejYBG65KQ6HaGqU7+rFM586lAvHg00o3+YZf3TVI=; b=i3iAeu8hIEEkfzCBDPfkmuVfNkK+aYqCkemXCu29OWS91C2CzQ3axGq0ucWXAA3emX bhDxGxM1635FivTj3exxYCRQ4mMHJhoY1ileoAKH9g4V+jR2zPZwd8++D8IVgHaw0pD4 /qrk9KqOcPt7+u8uOcuWXHvIo3KL3nfMq6AVyNQUNCYfY2Uz0rRedaMTeFcLm3cJQf2k Vcb96jm7FD0ijCcxBXyh2Qp6uLNG6GrG3bYT804N9tnya8yBceUHKxBO5Dj9AeCN1ZDL ksInANYdQsmrFB0NFlCPbk4vY5mkPmdggY+OWxd0xfdl3Ot6bn6DUwKnKZxhOv3Zd9/W SpGw== X-Gm-Message-State: APjAAAUHLvNFgh1g1lTiGjIZPAOu+32vzZ5Kjl2GtR41DUMvS9YmGjmr KeViHSuHXNjv+MOYyZcfBHYl5hxJ X-Google-Smtp-Source: APXvYqzix1DZp5I2NYaz3EFuioKbLX6jqr5SrrNRLAY0u01c6l3ooJAk9EPXHZXH0Zvr9hkLaF2H9w== X-Received: by 2002:adf:e7ca:: with SMTP id e10mr3173576wrn.234.1569342714882; Tue, 24 Sep 2019 09:31:54 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id y13sm3925434wrg.8.2019.09.24.09.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 09:31:53 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Sep 2019 18:31:43 +0200 Message-Id: <20190924163144.26443-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922125543.GW3219@michaelspb> References: <20190922125543.GW3219@michaelspb> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/utils: Assert that stream_index is valid 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" There is currently an ordinary check for this (which would lead to a memleak), but given that no demuxer should ever return a packet with an invalid stream_index it is more appropriate for this to be an assert. FATE passes with this change. Signed-off-by: Andreas Rheinhardt --- libavformat/utils.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 3983a3f4ce..d8ef5fe54c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -884,10 +884,8 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) continue; } - if (pkt->stream_index >= (unsigned)s->nb_streams) { - av_log(s, AV_LOG_ERROR, "Invalid stream index %d\n", pkt->stream_index); - continue; - } + av_assert0(pkt->stream_index < (unsigned)s->nb_streams && + "Invalid stream index.\n"); st = s->streams[pkt->stream_index];