Commit ff65a2c3 authored by Rémi Duraffort's avatar Rémi Duraffort

postproc: fix potential crash (var_DelCallback missing and callback added too

early).
(cherry picked from commit 36eb6ac9)
Signed-off-by: default avatarRémi Duraffort <ivoire@videolan.org>
parent 65d210e1
...@@ -196,7 +196,6 @@ static int OpenPostproc( vlc_object_t *p_this ) ...@@ -196,7 +196,6 @@ static int OpenPostproc( vlc_object_t *p_this )
/* For some obscure reason the VLC_VAR_ISCOMMAND isn't taken into account /* For some obscure reason the VLC_VAR_ISCOMMAND isn't taken into account
in during var_Create */ in during var_Create */
var_Change( p_filter, FILTER_PREFIX "q", VLC_VAR_SETISCOMMAND, NULL, NULL ); var_Change( p_filter, FILTER_PREFIX "q", VLC_VAR_SETISCOMMAND, NULL, NULL );
var_AddCallback( p_filter, FILTER_PREFIX "q", PPQCallback, NULL );
text.psz_string = _("Post processing"); text.psz_string = _("Post processing");
var_Change( p_filter, FILTER_PREFIX "q", VLC_VAR_SETTEXT, &text, NULL ); var_Change( p_filter, FILTER_PREFIX "q", VLC_VAR_SETTEXT, &text, NULL );
...@@ -206,7 +205,6 @@ static int OpenPostproc( vlc_object_t *p_this ) ...@@ -206,7 +205,6 @@ static int OpenPostproc( vlc_object_t *p_this )
val.psz_string = var_CreateGetNonEmptyStringCommand( val.psz_string = var_CreateGetNonEmptyStringCommand(
p_filter, FILTER_PREFIX "name" ); p_filter, FILTER_PREFIX "name" );
var_AddCallback( p_filter, FILTER_PREFIX "name", PPNameCallback, NULL );
if( val_orig.i_int ) if( val_orig.i_int )
{ {
p_sys->pp_mode = pp_get_mode_by_name_and_quality( val.psz_string ? p_sys->pp_mode = pp_get_mode_by_name_and_quality( val.psz_string ?
...@@ -251,7 +249,11 @@ static int OpenPostproc( vlc_object_t *p_this ) ...@@ -251,7 +249,11 @@ static int OpenPostproc( vlc_object_t *p_this )
&val, text.psz_string?&text:NULL ); &val, text.psz_string?&text:NULL );
} }
vlc_mutex_init( &p_sys->lock ); /* FIXME: too late w.r.t. callback */ vlc_mutex_init( &p_sys->lock );
/* Add the callback at the end to prevent crashes */
var_AddCallback( p_filter, FILTER_PREFIX "q", PPQCallback, NULL );
var_AddCallback( p_filter, FILTER_PREFIX "name", PPNameCallback, NULL );
p_filter->pf_video_filter = PostprocPict; p_filter->pf_video_filter = PostprocPict;
p_sys->b_had_matrix = true; p_sys->b_had_matrix = true;
...@@ -267,7 +269,11 @@ static void ClosePostproc( vlc_object_t *p_this ) ...@@ -267,7 +269,11 @@ static void ClosePostproc( vlc_object_t *p_this )
filter_t *p_filter = (filter_t *)p_this; filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys; filter_sys_t *p_sys = p_filter->p_sys;
/* FIXME: delete callbacks before mutex */ /* delete the callback before destroying the mutex */
var_DelCallback( p_filter, FILTER_PREFIX "q", PPQCallback, NULL );
var_DelCallback( p_filter, FILTER_PREFIX "name", PPNameCallback, NULL );
/* Destroy the resources */
vlc_mutex_destroy( &p_sys->lock ); vlc_mutex_destroy( &p_sys->lock );
pp_free_context( p_sys->pp_context ); pp_free_context( p_sys->pp_context );
if( p_sys->pp_mode ) pp_free_mode( p_sys->pp_mode ); if( p_sys->pp_mode ) pp_free_mode( p_sys->pp_mode );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment