X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_arrays.h;h=e001d4e86e9b4e4733da97c7fc9c979584abccbf;hb=a45076375c3dd884bd7dd586335937f05e0e394b;hp=8aab58be477fe3d14b526c2c578ca3732da76d89;hpb=d248d3f2f9a3ca4b8b9508c84ee96d07c362c82b;p=vlc

diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h
index 8aab58be47..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 = 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];
 
@@ -364,6 +372,7 @@ vlc_dictionary_value_for_key( const vlc_dictionary_t * p_dict, const char * psz_
         p_entry = p_entry->p_next;
     } while( p_entry );
 
+    return kVLCDictionaryNotFound;
 }
 
 static inline int
@@ -384,10 +393,8 @@ vlc_dictionary_all_keys( const vlc_dictionary_t * p_dict )
     struct vlc_dictionary_entry_t * p_entry;
     char ** ppsz_ret;
     int i, count = vlc_dictionary_keys_count( p_dict );
-    if( !count )
-        return NULL;
 
-    ppsz_ret = malloc(sizeof(char *) * (count + 1));
+    ppsz_ret = (char**)malloc(sizeof(char *) * (count + 1));
     assert( ppsz_ret );
     
     count = 0;
@@ -407,12 +414,16 @@ 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];
 
     if( !p_entry )
     {
-        p_entry = p_dict->p_entries[i_pos] = malloc(sizeof(struct vlc_dictionary_entry_t));
+        p_entry = p_dict->p_entries[i_pos] = (struct vlc_dictionary_entry_t *)malloc(
+                sizeof(struct vlc_dictionary_entry_t));
         assert( p_entry );
 
         p_entry->psz_key = strdup( psz_key );
@@ -430,7 +441,7 @@ __vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key,
     }
 
     /* Hash collision here */
-    p_entry = malloc(sizeof(struct vlc_dictionary_entry_t));
+    p_entry = (struct vlc_dictionary_entry_t *)malloc(sizeof(struct vlc_dictionary_entry_t));
     assert( p_entry );
     p_entry->psz_key = strdup( psz_key );
     p_entry->p_value = p_value;
@@ -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;