[vlc-commits] Refuse to load any module if "none" is requested

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov 17 22:33:32 2012 +0200| [384062b82c788c69b1c3af133a541131cdf88406] | committer: Rémi Denis-Courmont

Refuse to load any module if "none" is requested

This matches behavior from previous versions. "none" can forcefully
disable a module even if strict mode is NOT enabled.

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

 src/modules/modules.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/modules/modules.c b/src/modules/modules.c
index 9ca3782..d9fdb7d 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -261,6 +261,9 @@ module_t *vlc_module_load(vlc_object_t *obj, const char *capability,
         const char *shortcut = buf;
         assert (shortcut != NULL);
 
+        if (!strcasecmp ("none", shortcut))
+            goto done;
+
         obj->b_force = strict && strcasecmp ("any", shortcut);
         for (ssize_t i = 0; i < total; i++)
         {