From 1855d4a8d0fcbdf273fd6cc771b0a90b418bd411 Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Mon, 13 Aug 2007 14:05:34 +0000 Subject: [PATCH] include/vlc_arrays.h: Allow zero sized vlc_dictionary_t creation. --- include/vlc_arrays.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h index 44e7f0ebd9..e001d4e86e 100644 --- a/include/vlc_arrays.h +++ b/include/vlc_arrays.h @@ -318,9 +318,14 @@ static void * const kVLCDictionaryNotFound = NULL; static inline void vlc_dictionary_init( vlc_dictionary_t * p_dict, int i_size ) { - p_dict->p_entries = (struct vlc_dictionary_entry_t **)malloc(sizeof(struct vlc_dictionary_entry_t *) * i_size); - assert( p_dict->p_entries ); - memset( p_dict->p_entries, 0, sizeof(struct vlc_dictionary_entry_t *) * i_size ); + if( i_size > 0 ) + { + p_dict->p_entries = (struct vlc_dictionary_entry_t **)malloc(sizeof(struct vlc_dictionary_entry_t *) * i_size); + assert( p_dict->p_entries ); + memset( p_dict->p_entries, 0, sizeof(struct vlc_dictionary_entry_t *) * i_size ); + } + else + p_dict->p_entries = NULL; p_dict->i_size = i_size; } @@ -348,6 +353,9 @@ static inline void vlc_dictionary_clear( vlc_dictionary_t * p_dict ) static inline void * vlc_dictionary_value_for_key( const vlc_dictionary_t * p_dict, const char * psz_key ) { + if( !p_dict->p_entries ) + return kVLCDictionaryNotFound; + int i_pos = DictHash( psz_key, p_dict->i_size ); struct vlc_dictionary_entry_t * p_entry = p_dict->p_entries[i_pos]; @@ -406,6 +414,9 @@ static inline void __vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, void * p_value, vlc_bool_t rebuild ) { + if( !p_dict->p_entries ) + vlc_dictionary_init( p_dict, 1 ); + int i_pos = DictHash( psz_key, p_dict->i_size ); struct vlc_dictionary_entry_t * p_entry = p_dict->p_entries[i_pos]; @@ -446,7 +457,7 @@ __vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, { /* Here it starts to be not good, rebuild a bigger dictionary */ struct vlc_dictionary_t new_dict; - int i_new_size = ( p_dict->i_size * 3) / 2; /* XXX: this need tuning */ + int i_new_size = ( (p_dict->i_size+2) * 3) / 2; /* XXX: this need tuning */ int i; vlc_dictionary_init( &new_dict, i_new_size ); @@ -477,6 +488,9 @@ vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, void * p static inline void vlc_dictionary_remove_value_for_key( const vlc_dictionary_t * p_dict, const char * psz_key ) { + if( !p_dict->p_entries ) + return; + int i_pos = DictHash( psz_key, p_dict->i_size ); struct vlc_dictionary_entry_t * p_entry = p_dict->p_entries[i_pos]; struct vlc_dictionary_entry_t * p_prev; -- 2.39.5