[FFmpeg-devel] [PATCH] format/imfdec: improve error handling when selecting tracks for playback

[Pierre-Anthony Lemieux]

Ping.

This patchset addresses a coverity issue #1512414.

On Wed, Sep 7, 2022 at 1:02 PM <pal at sandflow.com> wrote:
>
> From: Pierre-Anthony Lemieux <pal at palemieux.com>
>
> 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
>