From c9c5170b8ad691bbf06111e08f9f911e68484fa8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Mon, 3 Mar 2008 14:55:52 +0100 Subject: [PATCH] Check only one time the return value of malloc. --- src/modules/modules.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; -- 2.39.2