lua/intf: Fix a memleak.

[vlc] / src / config / chain.c

diff --git a/src/config/chain.c b/src/config/chain.c
index 53cd9e35118ef2e7abb402516bfd903e3929cd18..db78ab718bff5da956ac5e3ddb13f0278c6645a3 100644 (file)
--- a/src/config/chain.c
+++ b/src/config/chain.c
@@ -27,7 +27,11 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include "libvlc.h"
 
 #include "vlc_interface.h"
@@ -116,7 +120,7 @@ char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, const char
             /* fprintf( stderr, "name=%s - rest=%s\n", psz_name, p ); */
             if( p == psz_name )
             {
-                fprintf( stderr, "invalid options (empty)" );
+                fprintf( stderr, "config_ChainCreate: invalid options (empty) \n" );
                 break;
             }
 
@@ -127,7 +131,7 @@ char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, const char
             if( *p == '=' || *p == '{' )
             {
                 const char *end;
-                vlc_bool_t b_keep_brackets = (*p == '{');
+                bool b_keep_brackets = (*p == '{');
 
                 if( *p == '=' ) p++;
 
@@ -248,8 +252,8 @@ void __config_ChainParse( vlc_object_t *p_this, const char *psz_prefix,
     for(; cfg; cfg = cfg->p_next )
     {
         vlc_value_t val;
-        vlc_bool_t b_yes = VLC_TRUE;
-        vlc_bool_t b_once = VLC_FALSE;
+        bool b_yes = true;
+        bool b_once = false;
         module_config_t *p_conf;
         int i_type;
         size_t i;
@@ -268,14 +272,14 @@ void __config_ChainParse( vlc_object_t *p_this, const char *psz_prefix,
                 ( !strncmp( cfg->psz_name, "no", 2 ) &&
                   !strcmp( ppsz_options[i], cfg->psz_name + 2 ) ) )
             {
-                b_yes = VLC_FALSE;
+                b_yes = false;
                 break;
             }
 
             if( *ppsz_options[i] == '*' &&
                 !strcmp( &ppsz_options[i][1], cfg->psz_name ) )
             {
-                b_once = VLC_TRUE;
+                b_once = true;
                 break;
             }
 
@@ -316,30 +320,6 @@ void __config_ChainParse( vlc_object_t *p_this, const char *psz_prefix,
                  msg_Warn( p_this, "Option %s is obsolete. Use %s instead.",
                            name, psz_name );
             }
-            if( p_conf->b_unsafe )
-            {
-                int policy = config_GetInt( p_this, "security-policy" );
-                switch( policy )
-                {
-                    case 0: /* block */
-                        msg_Err( p_this, "option %s is unsafe and is blocked by security policy", psz_name );
-                        return;
-                    case 1: /* allow */
-                        break;
-                    case 2: /* prompt */
-                    {
-                        char description[256];
-                        snprintf(description, sizeof(description), _("playlist item is making use of the following unsafe option '%s', which may be harmful if used in a malicious way, authorize it ?"), psz_name);
-                        if( DIALOG_OK_YES != intf_UserYesNo( p_this, _("WARNING: Unsafe Playlist"), description, _("Yes"), _("No"), NULL) )
-                        {
-                            msg_Err( p_this, "option %s is unsafe and is blocked by security policy", psz_name );
-                            return;
-                        }
-                    }
-                    default:
-                        ;
-                }
-            }
         }
         /* </Check if the option is deprecated> */