Save one memory copy and fix the helper module leak

diff --git a/include/vlc_modules_macros.h b/include/vlc_modules_macros.h
index d7011deb0d60f5507923c1d1c9c98af3af492bec..96a2aeccd2dd51f0c20d8b868ee457321ab226b3 100644 (file)
--- a/include/vlc_modules_macros.h
+++ b/include/vlc_modules_macros.h
@@ -121,14 +121,10 @@ E_(vlc_entry) ( module_t *p_module );
 
 #define vlc_module_end( )                                                     \
         }                                                                     \
-        res = config_Duplicate( p_module, p_config, ++i_config );             \
-        free( p_config );                                                     \
-        if (res)                                                              \
-            return res;                                                       \
-        return VLC_SUCCESS;                                                   \
+        return config_Duplicate( p_module, p_config, ++i_config );            \
                                                                               \
     error:                                                                    \
-        free( p_config );                                                     \
+        /* FIXME: config_Free( p_config ); */                                 \
         /* FIXME: cleanup submodules objects ??? */                           \
         return VLC_EGENERIC;                                                  \
     }                                                                         \

diff --git a/src/config/core.c b/src/config/core.c
index 4031fb52ceb88fbf6612b86b56e176a8d7043ab8..0caaa6fae10ca45b49c9e08f253b114113eb48f8 100644 (file)
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -492,9 +492,6 @@ int config_Duplicate( module_t *p_module, const module_config_t *p_orig,
     const module_config_t *p_item, *p_end = p_orig + n;
 
     /* Calculate the structure length */
-    p_module->i_config_items = 0;
-    p_module->i_bool_items = 0;
-
     for( p_item = p_orig; p_item < p_end; p_item++ )
     {
         if( p_item->i_type & CONFIG_ITEM )
@@ -508,19 +505,12 @@ int config_Duplicate( module_t *p_module, const module_config_t *p_orig,
         }
     }
 
-    /* Allocate memory */
-    p_module->p_config = (module_config_t *)calloc( n, sizeof(*p_orig) );
-    if( p_module->p_config == NULL )
-    {
-        msg_Err( p_module, "config error: can't duplicate p_config" );
-        return VLC_ENOMEM;
-    }
+    p_module->p_config = p_orig;
     p_module->confsize = n;
 
     /* Do the duplication job */
     for( size_t i = 0; i < n ; i++ )
     {
-        p_module->p_config[i] = p_orig[i];
         p_module->p_config[i].p_lock = &p_module->object_lock;
     }
     return VLC_SUCCESS;

diff --git a/src/modules/entry.c b/src/modules/entry.c
index 4064862a2c3fcfc8086f6bbfdcabc6d62d6736df..94667fc6f7d69fad57c9acce7342e10a030f61e1 100644 (file)
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -40,6 +40,8 @@ module_t *vlc_module_create (vlc_object_t *obj)
     module->psz_object_name = module->psz_longname = default_name;
     module->psz_capability = "";
     module->i_score = 1;
+    module->i_config_items = module->i_bool_items = 0;
+
     return module;
 }
 
@@ -161,6 +163,13 @@ module_config_t *vlc_config_create (module_t *module, int type)
     tab[confsize].i_type = type;
     tab[confsize].p_lock = &module->object_lock;
 
+    if (type & CONFIG_ITEM)
+    {
+        module->i_config_items++;
+        if (type == CONFIG_ITEM_BOOL)
+            module->i_bool_items++;
+    }
+
     return tab + confsize;
 }