Commit 44370bcc authored by Rémi Duraffort's avatar Rémi Duraffort

Fix memleak, check return value.

parent cef16536
...@@ -172,9 +172,14 @@ static int Open( vlc_object_t *p_this ) ...@@ -172,9 +172,14 @@ static int Open( vlc_object_t *p_this )
/* Allocate structure */ /* Allocate structure */
p_sys = p_filter->p_sys = malloc( sizeof( aout_filter_sys_t ) ); p_sys = p_filter->p_sys = malloc( sizeof( aout_filter_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
if( EqzInit( p_filter, p_filter->input.i_rate ) ) if( EqzInit( p_filter, p_filter->input.i_rate ) )
{
free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
}
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -358,12 +363,15 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) ...@@ -358,12 +363,15 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate )
PreampCallback( VLC_OBJECT( p_aout ), NULL, val3, val3, p_sys ); PreampCallback( VLC_OBJECT( p_aout ), NULL, val3, val3, p_sys );
p_sys->b_first = false; p_sys->b_first = false;
free( val1.psz_string );
/* Register preset bands (for intf) if : */ /* Register preset bands (for intf) if : */
/* We have no bands info --> the preset info must be given to the intf */ /* We have no bands info --> the preset info must be given to the intf */
/* or The bands info matches the preset */ /* or The bands info matches the preset */
if (p_sys->psz_newbands == NULL) if (p_sys->psz_newbands == NULL)
{ {
msg_Err(p_filter, "No preset selected"); msg_Err(p_filter, "No preset selected");
free( val2.psz_string );
return (VLC_EGENERIC); return (VLC_EGENERIC);
} }
if( ( *(val2.psz_string) && if( ( *(val2.psz_string) &&
...@@ -373,6 +381,7 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) ...@@ -373,6 +381,7 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate )
if( p_sys->f_newpreamp == p_sys->f_gamp ) if( p_sys->f_newpreamp == p_sys->f_gamp )
var_SetFloat( p_aout, "equalizer-preamp", p_sys->f_newpreamp ); var_SetFloat( p_aout, "equalizer-preamp", p_sys->f_newpreamp );
} }
free( val2.psz_string );
/* Add our own callbacks */ /* Add our own callbacks */
var_AddCallback( p_aout, "equalizer-preset", PresetCallback, p_sys ); var_AddCallback( p_aout, "equalizer-preset", PresetCallback, p_sys );
...@@ -467,6 +476,7 @@ static void EqzClean( aout_filter_t *p_filter ) ...@@ -467,6 +476,7 @@ static void EqzClean( aout_filter_t *p_filter )
free( p_sys->f_gamma ); free( p_sys->f_gamma );
free( p_sys->f_amp ); free( p_sys->f_amp );
free( p_sys->psz_newbands );
} }
......
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