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

Fix a segfault if the mask can't be loaded.

(cherry picked from commit 77190676 and
b50e987e)
Signed-off-by: default avatarRémi Duraffort <ivoire@videolan.org>
parent 05f10ae5
......@@ -114,6 +114,9 @@ static void LoadMask( filter_t *p_filter, const char *psz_filename )
p_filter->p_sys->p_mask = p_old_mask;
msg_Err( p_filter, "Error while loading new mask. Keeping old mask." );
}
else
msg_Err( p_filter, "Error while loading new mask. No mask available." );
image_HandlerDelete( p_image );
}
......@@ -166,6 +169,7 @@ static int Create( vlc_object_t *p_this )
p_sys->p_mask = NULL;
LoadMask( p_filter, psz_filename );
free( psz_filename );
p_sys->i_x = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "x" );
p_sys->i_y = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "y" );
......@@ -201,6 +205,7 @@ static void Destroy( vlc_object_t *p_this )
static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
{
picture_t *p_outpic;
filter_sys_t *p_sys = p_filter->p_sys;
if( !p_pic ) return NULL;
......@@ -211,8 +216,13 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
return NULL;
}
/* Here */
/* If the mask is empty: just copy the image */
vlc_mutex_lock( &p_sys->lock );
if( p_sys->p_mask )
FilterErase( p_filter, p_pic, p_outpic );
else
picture_CopyPixels( p_outpic, p_pic );
vlc_mutex_unlock( &p_sys->lock );
return CopyInfoAndRelease( p_outpic, p_pic );
}
......@@ -225,7 +235,6 @@ static void FilterErase( filter_t *p_filter, picture_t *p_inpic,
{
filter_sys_t *p_sys = p_filter->p_sys;
vlc_mutex_lock( &p_sys->lock );
const int i_mask_pitch = p_sys->p_mask->A_PITCH;
const int i_mask_visible_pitch = p_sys->p_mask->p[A_PLANE].i_visible_pitch;
const int i_mask_visible_lines = p_sys->p_mask->p[A_PLANE].i_visible_lines;
......@@ -394,7 +403,6 @@ static void FilterErase( filter_t *p_filter, picture_t *p_inpic,
}
}
}
vlc_mutex_unlock( &p_sys->lock );
}
static int EraseCallback( vlc_object_t *p_this, char const *psz_var,
......
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