From patchwork Wed Sep 7 20:02:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 37747 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp4120792pzh; Wed, 7 Sep 2022 13:02:54 -0700 (PDT) X-Google-Smtp-Source: AA6agR67Ub6/beFn8gIz1G4yon7/CkCoPwbVG2Ytnl4ukZAlZ4B61jdlif+NMqAr5M/60RUGaJ2a X-Received: by 2002:a17:907:7601:b0:73d:9f0b:d99f with SMTP id jx1-20020a170907760100b0073d9f0bd99fmr3450317ejc.300.1662580974035; Wed, 07 Sep 2022 13:02:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662580974; cv=none; d=google.com; s=arc-20160816; b=rCjeyUXrJP0QPt70H2R4B11VEUeMMemo11RFIyJiwk18hV38Qq5IEwieB7dMGH80P/ IXzy2s4HKsuztu5/ftJiQfmynTaxJoMar/BhJMK1nNm9Em1xlP+oPSBetYLnSwywbMEW 6rsoHD+TAQ2Oirz3ovmXCQ4bxPvlywoF86xCvtFg5XBjEE7TPtVXzp8N+a05XsiRZMsJ 7nOzIqrC1v2QMazhFz41K9yuPb3/TBYrpeDZ+x62dmAuzFe2XcL3/IJ5Xj+stBjab4Av hxtju/Nb9ZcAt2jeEokttqTztMYa56xzKeFYcch26SFJAHePJJv8MdNYrogMPHGLIJcw QU5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=/UI1hAuTIbciLxQ32Kl9wTuSKxc5NlcymudecAsc/cc=; b=ZKUZg8MsuA6ee/ZoNHqgRI3XL+2tFMgePbCCtwWwS0rPI0vR1Ckq1ZdBhJQvVw5aGN kl0d0azz6HHlg7Dx5F/jcfoz/xfQhyKSjT9TFKHevMqkryDGfivaE1xYuxzq5P6+ushS lU5crxEjU1DxLdbBU4ZR5TML348aGxPmhYvoIHEcx+7xkhWuDIkCYdwJlZuizwHz78cs kNO8NhdR+b0h8r7YB/3pN4ULkdtjeA0BvAnJIL0ryzO/CNkcFAE/AyClxjYprvq0ooyq ZcAwY2d6/25kPMNn5lU5XS0KA4H0qQe19hGiXDlKPrg/V4TE81010r8ZZtNFagh4UajE h6bw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h9-20020a05640250c900b00445eb9dfb3dsi14617105edb.353.2022.09.07.13.02.53; Wed, 07 Sep 2022 13:02:54 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5650F68B922; Wed, 7 Sep 2022 23:02:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64A3768B788 for ; Wed, 7 Sep 2022 23:02:45 +0300 (EEST) Received: by mail-pj1-f43.google.com with SMTP id o4so15581927pjp.4 for ; Wed, 07 Sep 2022 13:02:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=sBUvcwLHdepcsFo/k7lWgd9MAHpW6aioNUZtcRzhn00=; b=rEzsyIFJywrijpw09w1eUSI17IDQIbqB4gy5TzoRYgxN2k+EMyAlmSTV+eXW6gQkO4 IppuXpD04Rd6o4HdjnBQ+daNKG+Ud7SFBfHfXa77qeDJpWnZQYvBXbB0wVTWQHfpm+0y n7j/1e8lQGYL9rmfQQMWQEqeroeBg11Apsq0bT3upPESbyhJAt1jggxuN+9Tw2qj/FEo 3qrCrBNfSQHbqclAXyeII7icrWcxPNTpHOOV/vjuJ8Q3rHXBQHVv2U82ETUzgP0PpLAN oZMWE0KpRLM1yjmk+RmpTi3fgmFn7FovxhZazV/W4gLIOPNTIUHqR8lBgqQoPTA02kMz snLg== X-Gm-Message-State: ACgBeo3A//uDLnBg7ROIXjdMemIZBDtwiM9TddRZ0LxxeWb0Xb7ph5Op PBtjaRieAvKPqk2bPnoFE36l+hrSPqM= X-Received: by 2002:a17:902:7c03:b0:172:56b1:8152 with SMTP id x3-20020a1709027c0300b0017256b18152mr5699785pll.16.1662580963325; Wed, 07 Sep 2022 13:02:43 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id y127-20020a626485000000b0053e8940c4absm1484244pfb.209.2022.09.07.13.02.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 13:02:42 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Wed, 07 Sep 2022 13:02:40 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Sep 2022 13:02:33 -0700 Message-Id: <20220907200233.21255-1-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] format/imfdec: improve error handling when selecting tracks for playback X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cRwlBzAD0bwo From: Pierre-Anthony Lemieux Addresses coverity 1512414 --- libavformat/imfdec.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index 5bbe7a53f8..58b1455c9f 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -681,8 +681,11 @@ static IMFVirtualTrackPlaybackCtx *get_next_track_with_minimum_timestamp(AVForma { IMFContext *c = s->priv_data; IMFVirtualTrackPlaybackCtx *track; + AVRational minimum_timestamp = av_make_q(INT_MAX, 1); + + if (!c->track_count) + return NULL; - AVRational minimum_timestamp = av_make_q(INT32_MAX, 1); for (uint32_t i = c->track_count; i > 0; i--) { av_log(s, AV_LOG_TRACE, "Compare track %d timestamp " AVRATIONAL_FORMAT " to minimum " AVRATIONAL_FORMAT @@ -697,8 +700,6 @@ static IMFVirtualTrackPlaybackCtx *get_next_track_with_minimum_timestamp(AVForma } } - av_log(s, AV_LOG_DEBUG, "Found next track to read: %d (timestamp: %lf / %lf)\n", - track->index, av_q2d(track->current_timestamp), av_q2d(minimum_timestamp)); return track; } @@ -761,6 +762,14 @@ static int imf_read_packet(AVFormatContext *s, AVPacket *pkt) track = get_next_track_with_minimum_timestamp(s); + if (!track) { + av_log(s, AV_LOG_ERROR, "No track found for playback\n"); + return AVERROR_INVALIDDATA; + } + + av_log(s, AV_LOG_DEBUG, "Found track %d to read at timestamp %lf\n", + track->index, av_q2d(track->current_timestamp)); + ret = get_resource_context_for_timestamp(s, track, &resource); if (ret) return ret;