Skip to content

V
vlc-1.1
Commit 0d40e8b4 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

Fix a memleak in item categories.

parent b2cd2124
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
src/input/item.c
View file @ 0d40e8b4
...@@ -575,7 +575,6 @@ int input_item_DelInfo( input_item_t *p_i, ...@@ -575,7 +575,6 @@ int input_item_DelInfo( input_item_t *p_i,
if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) ) if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
{ {
free( p_cat->pp_infos[i]->psz_name ); free( p_cat->pp_infos[i]->psz_name );
if( p_cat->pp_infos[i]->psz_value )
free( p_cat->pp_infos[i]->psz_value ); free( p_cat->pp_infos[i]->psz_value );
free( p_cat->pp_infos[i] ); free( p_cat->pp_infos[i] );
REMOVE_ELEM( p_cat->pp_infos, p_cat->i_infos, i ); REMOVE_ELEM( p_cat->pp_infos, p_cat->i_infos, i );
...@@ -594,14 +593,16 @@ int input_item_DelInfo( input_item_t *p_i, ...@@ -594,14 +593,16 @@ int input_item_DelInfo( input_item_t *p_i,
for( i = 0; i < p_cat->i_infos; i++ ) for( i = 0; i < p_cat->i_infos; i++ )
{ {
free( p_cat->pp_infos[i]->psz_name ); free( p_cat->pp_infos[i]->psz_name );
if( p_cat->pp_infos[i]->psz_value )
free( p_cat->pp_infos[i]->psz_value ); free( p_cat->pp_infos[i]->psz_value );
free( p_cat->pp_infos[i] ); free( p_cat->pp_infos[i] );
} }
if( p_cat->pp_infos )
free( p_cat->pp_infos ); free( p_cat->pp_infos );
REMOVE_ELEM( p_i->pp_categories, p_i->i_categories, i_cat ); REMOVE_ELEM( p_i->pp_categories, p_i->i_categories, i_cat );
} }
// Free the category
free( p_cat->psz_name );
free( p_cat );
vlc_mutex_unlock( &p_i->lock ); vlc_mutex_unlock( &p_i->lock );
......
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