[vlc-commits] addons: fsstorage: missing check for managed skins files

Francois Cartegnie git at videolan.org
Wed Feb 12 02:36:57 CET 2014


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Feb 12 02:24:51 2014 +0100| [b039995fb0a148dce476369e46085018c85bd9ca] | committer: Francois Cartegnie

addons: fsstorage: missing check for managed skins files

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b039995fb0a148dce476369e46085018c85bd9ca
---

 modules/misc/addons/fsstorage.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/misc/addons/fsstorage.c b/modules/misc/addons/fsstorage.c
index a207a1e..c58be03 100644
--- a/modules/misc/addons/fsstorage.c
+++ b/modules/misc/addons/fsstorage.c
@@ -64,6 +64,9 @@ static int   OpenLister ( vlc_object_t * );
 static void  CloseLister ( vlc_object_t * );
 
 static int   LoadCatalog ( addons_finder_t * );
+static bool  FileBelongsToManagedAddon( addons_finder_t *p_finder,
+                                        const addon_type_t e_type,
+                                        const char *psz_file );
 /*****************************************************************************
  * Module descriptor
  ****************************************************************************/
@@ -208,6 +211,9 @@ static int ListSkins( addons_finder_t *p_finder )
         if( !psz_file )
             break;
 
+        if ( FileBelongsToManagedAddon( p_finder, ADDON_SKIN2, psz_file ) )
+             continue;
+
         char *psz_uri;
         if( asprintf( &psz_uri, "unzip://%s/%s!/theme.xml", psz_dir, psz_file ) >= 0)
         {



More information about the vlc-commits mailing list