From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 300F0429B0 for ; Wed, 7 Sep 2022 20:02:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 16AC968B912; Wed, 7 Sep 2022 23:02:51 +0300 (EEST) 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-Google-Smtp-Source: AA6agR6ycf+85Czky0yugBUon0fXIhsRLkn6sRfnYx++IYVsBpdwCakldGc1DWZ/DpqjqxFKmhlZrQ== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".