[vlc-devel] [PATCH] vout: fix invalid clean in error path

[Marvin Scholz]

LGTM

On 2 Dec 2019, at 17:34, Thomas Guillem wrote:

> Prerender mutexes, conditions and formats must be initialized before 
> the first
> possible spu_Cleanup().
> ---
>  src/video_output/vout_subpictures.c | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/src/video_output/vout_subpictures.c 
> b/src/video_output/vout_subpictures.c
> index 0a367c9bed1..76fec39d47d 100644
> --- a/src/video_output/vout_subpictures.c
> +++ b/src/video_output/vout_subpictures.c
> @@ -1684,6 +1684,16 @@ spu_t *spu_Create(vlc_object_t *object, 
> vout_thread_t *vout)
>      sys->source_chain = filter_chain_NewSPU(spu, "sub source");
>      sys->filter_chain = filter_chain_NewSPU(spu, "sub filter");
>
> +    vlc_mutex_init(&sys->prerender.lock);
> +    vlc_cond_init(&sys->prerender.cond);
> +    vlc_cond_init(&sys->prerender.output_cond);
> +    vlc_vector_init(&sys->prerender.vector);
> +    video_format_Init(&sys->prerender.fmtdst, 0);
> +    video_format_Init(&sys->prerender.fmtsrc, 0);
> +    sys->prerender.p_processed = NULL;
> +    sys->prerender.chroma_list[0] = 0;
> +    sys->prerender.chroma_list[SPU_CHROMALIST_COUNT] = 0;
> +
>      /* Load text and scale module */
>      sys->text = SpuRenderCreateAndLoadText(spu);
>      vlc_mutex_init(&sys->textlock);
> @@ -1711,15 +1721,6 @@ spu_t *spu_Create(vlc_object_t *object, 
> vout_thread_t *vout)
>      sys->last_sort_date = -1;
>      sys->vout = vout;
>
> -    vlc_mutex_init(&sys->prerender.lock);
> -    vlc_cond_init(&sys->prerender.cond);
> -    vlc_cond_init(&sys->prerender.output_cond);
> -    vlc_vector_init(&sys->prerender.vector);
> -    video_format_Init(&sys->prerender.fmtdst, 0);
> -    video_format_Init(&sys->prerender.fmtsrc, 0);
> -    sys->prerender.p_processed = NULL;
> -    sys->prerender.chroma_list[0] = 0;
> -    sys->prerender.chroma_list[SPU_CHROMALIST_COUNT] = 0;
>      if(vlc_clone(&sys->prerender.thread, spu_PrerenderThread, spu, 
> VLC_THREAD_PRIORITY_VIDEO))
>      {
>          spu_Cleanup(spu);
> -- 
> 2.20.1
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel