Commit fe06aba7 authored by hartman's avatar hartman Committed by Jean-Baptiste Kempf
Browse files

macosx controls: Another string memleak.


(cherry picked from commit 1692e7000a5639bb70d1d48b761ee40707ddc560)
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 93b60e9b
......@@ -701,7 +701,6 @@
[o_mi setTitle: [[VLCMain sharedInstance] localizedString: text.psz_string ?
text.psz_string : psz_variable ]];
var_Get( p_object, psz_variable, &val );
if( i_type & VLC_VAR_HASCHOICE )
{
NSMenu *o_menu = [o_mi submenu];
......@@ -712,6 +711,10 @@
free( text.psz_string );
return;
}
if( var_Get( p_object, psz_variable, &val ) < 0 )
{
return;
}
VLCAutoGeneratedMenuContent *o_data;
switch( i_type & VLC_VAR_TYPE )
......@@ -731,8 +734,7 @@
break;
default:
free( text.psz_string );
return;
break;
}
if( ( i_type & VLC_VAR_TYPE ) == VLC_VAR_STRING ) free( val.psz_string );
......@@ -825,7 +827,6 @@
for( i = 0; i < val_list.p_list->i_count; i++ )
{
vlc_value_t another_val;
NSMenuItem * o_lmi;
NSString *o_title = @"";
VLCAutoGeneratedMenuContent *o_data;
......@@ -833,15 +834,13 @@
switch( i_type & VLC_VAR_TYPE )
{
case VLC_VAR_STRING:
another_val.psz_string =
strdup(val_list.p_list->p_values[i].psz_string);
o_title = [[VLCMain sharedInstance] localizedString: text_list.p_list->p_values[i].psz_string ?
text_list.p_list->p_values[i].psz_string : val_list.p_list->p_values[i].psz_string ];
o_lmi = [o_menu addItemWithTitle: o_title action: pf_callback keyEquivalent: @""];
o_data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName: psz_variable ofObject: p_object
andValue: another_val ofType: i_type];
andValue: val_list.p_list->p_values[i] ofType: i_type];
[o_lmi setRepresentedObject: [o_data autorelease]];
[o_lmi setTarget: self];
......@@ -1152,10 +1151,12 @@
if( self != nil )
{
psz_name = strdup( name );
_vlc_object = vlc_object_hold( object );
value = val;
psz_name = strdup( name );
i_type = type;
value = val;
if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
value.psz_string = strdup( val.psz_string );
}
return( self );
......@@ -1164,6 +1165,8 @@
- (void)dealloc
{
vlc_object_release( _vlc_object );
if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
free( value.psz_string );
free( psz_name );
[super dealloc];
}
......
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