aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2024-06-03 00:16:18 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2024-06-12 00:39:11 +0200
commitf10493f6fc2a79f706138d90420a4369b9655a47 (patch)
tree17fdce7f63dc90d5985da35b8113b19b74260b42
parentc21fb3624bb7e10f9ee5a182bf9cfbf64990c78e (diff)
downloadffmpeg-f10493f6fc2a79f706138d90420a4369b9655a47.tar.gz
avformat/imfdec: Simplify get_next_track_with_minimum_timestamp()
This also makes the code more robust Fixes: CID1512414 Uninitialized pointer read Sponsored-by: Sovereign Tech Fund Reviewed-by: Pierre-Anthony Lemieux <pal@sandflow.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/imfdec.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c
index 32208f89cc..a86b4763ff 100644
--- a/libavformat/imfdec.c
+++ b/libavformat/imfdec.c
@@ -695,12 +695,9 @@ static int imf_read_header(AVFormatContext *s)
static IMFVirtualTrackPlaybackCtx *get_next_track_with_minimum_timestamp(AVFormatContext *s)
{
IMFContext *c = s->priv_data;
- IMFVirtualTrackPlaybackCtx *track;
+ IMFVirtualTrackPlaybackCtx *track = NULL;
AVRational minimum_timestamp = av_make_q(INT32_MAX, 1);
- if (!c->track_count)
- return NULL;
-
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