From: Rémi Duraffort <ivoire@via.ecp.fr>
Date: Mon, 3 Mar 2008 13:55:52 +0000 (+0100)
Subject: Check only one time the return value of malloc.
X-Git-Tag: 0.9.0-test0~2354
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c9c5170b8ad691bbf06111e08f9f911e68484fa8;p=vlc

Check only one time the return value of malloc.
---

diff --git a/src/modules/modules.c b/src/modules/modules.c
index bfd4578ad5..29594e11ce 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -875,6 +875,9 @@ module_config_t *module_GetConfig( const module_t *module, unsigned *restrict ps
     assert( psize != NULL );
     *psize = 0;
 
+    if( !config )
+        return NULL;
+
     for( i = 0, j = 0; i < size; i++ )
     {
         const module_config_t *item = module->p_config + i;
@@ -883,8 +886,7 @@ module_config_t *module_GetConfig( const module_t *module, unsigned *restrict ps
          || item->b_removed /* removed option */ )
             continue;
 
-        if( config != NULL )
-            memcpy( config + j, item, sizeof( *config ) );
+        memcpy( config + j, item, sizeof( *config ) );
         j++;
     }
     *psize = j;