* fixed 2 segfaults when switching categories within the preferences. The options...

diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index cf2d66601bb491800349fb30b9d94a678fa03396..0b21f1394ebf2c8170f944039d0216e2628cdee1 100644 (file)
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -632,7 +632,7 @@ static VLCTreeItem *o_root_item = nil;
             do
             {
                 p_item++;
-                if( !p_item )
+                if( !p_item || !p_item->i_type )
                 {
                     msg_Err( p_intf, "invalid preference item found" );
                     break;

diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m
index d23d3705c6b0f3f9637ce86654cc31019533e7d7..062845e546901ff35cd92d5cdfb36b3bd62587ad 100644 (file)
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -392,7 +392,7 @@
     if( self != nil )
     {
         p_item = _p_item;
-        psz_name = strdup( p_item->psz_name );
+        psz_name = p_item->psz_name;
         o_label = NULL;
         i_type = p_item->i_type;
         i_view_type = 0;