[FFmpeg-devel] [PATCH] ffplay: set stream_index to -1 earlier to prevent segfault

[Marton Balint]

On Sat, 18 Apr 2020, Peter Ross wrote:

> Signed-off-by: Peter Ross <pross at xvid.org>
> Reviewed-by: Marton Balint <cus at passwd.hu>
> ---
>
> Great suggestion. I will apply in a few days if no objections.
>
> fftools/ffplay.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fftools/ffplay.c b/fftools/ffplay.c
> index 1beec54293..d673b8049a 100644
> --- a/fftools/ffplay.c
> +++ b/fftools/ffplay.c
> @@ -2775,9 +2775,6 @@ static int read_thread(void *arg)
>     }
>
>     memset(st_index, -1, sizeof(st_index));
> -    is->last_video_stream = is->video_stream = -1;
> -    is->last_audio_stream = is->audio_stream = -1;
> -    is->last_subtitle_stream = is->subtitle_stream = -1;
>     is->eof = 0;
>
>     ic = avformat_alloc_context();
> @@ -3083,6 +3080,9 @@ static VideoState *stream_open(const char *filename, AVInputFormat *iformat)
>     is = av_mallocz(sizeof(VideoState));
>     if (!is)
>         return NULL;
> +    is->last_video_stream = is->video_stream = -1;
> +    is->last_audio_stream = is->audio_stream = -1;
> +    is->last_subtitle_stream = is->subtitle_stream = -1;
>     is->filename = av_strdup(filename);
>     if (!is->filename)
>         goto fail;

LGTM, thanks.

Marton