changeset 4159:65bb64b7747e

Automated merge with ssh://hg.atheme.org//hg/audacious

--- a/src/audacious/input.c	Wed Jan 09 23:37:16 2008 +0300
+++ b/src/audacious/input.c	Wed Jan 09 23:38:10 2008 +0300
@@ -516,11 +516,11 @@
                     return pr;
                 }
             }
+
+	    g_free(filename_proxy);
+	    vfs_fclose(fd);
+	    return NULL; // no plugin found.
         }
-
-        g_free(filename_proxy);
-        vfs_fclose(fd);
-        return NULL; // no plugin found.
     }
 
 

--- a/src/audacious/skin.c	Wed Jan 09 23:37:16 2008 +0300
+++ b/src/audacious/skin.c	Wed Jan 09 23:38:10 2008 +0300
@@ -1231,7 +1231,7 @@
 
     if (inifile || default_hex) {
         if (inifile) {
-            value = g_strdup(read_ini_string(inifile, section, key));
+            value = read_ini_string(inifile, section, key);
             if (value == NULL) {
                 value = g_strdup(default_hex);
             }

--- a/src/audacious/util.c	Wed Jan 09 23:37:16 2008 +0300
+++ b/src/audacious/util.c	Wed Jan 09 23:38:10 2008 +0300
@@ -413,11 +413,23 @@
     string->str = lower;
 }
 
+static void
+close_ini_file_free_value(gpointer value)
+{
+    g_free((gchar*)value);
+}
+
+static void
+close_ini_file_free_section(gpointer section)
+{
+    g_hash_table_destroy((GHashTable*)section);
+}
+
 INIFile *
 open_ini_file(const gchar *filename)
 {
-    GHashTable *ini_file = g_hash_table_new(NULL, NULL);
-    GHashTable *section = g_hash_table_new(NULL, NULL);
+    GHashTable *ini_file = NULL;
+    GHashTable *section = NULL;
     GString *section_name, *key_name, *value;
     gpointer section_hash, key_hash;
     gchar *buffer = NULL;
@@ -426,23 +438,11 @@
 
     unsigned char x[] = { 0xff, 0xfe, 0x00 };
 
-
     g_return_val_if_fail(filename, NULL);
-
-    section_name = g_string_new("");
-    key_name = g_string_new(NULL);
-    value = g_string_new(NULL);
-
-    /* make a nameless section which should store all entries that are not
-     * embedded in a section */
-    section_hash = GINT_TO_POINTER(g_string_hash(section_name));
-    g_hash_table_insert(ini_file, section_hash, section);
-
     vfs_file_get_contents(filename, &buffer, &filesize);
     if (buffer == NULL)
         return NULL;
 
-
     /*
      * Convert UTF-16 into something useful. Original implementation
      * by incomp@#audacious. Cleanups \nenolod
@@ -455,10 +455,13 @@
 
         for (counter = 2; counter < filesize; counter += 2)
         {
-            if (!memcmp(&buffer[counter+1], &x[2], 1))
+            if (!memcmp(&buffer[counter+1], &x[2], 1)) {
                 outbuf[(counter-2)/2] = buffer[counter];
-            else
+            } else {
+                g_free(buffer);
+                g_free(outbuf);
                 return NULL;
+            }
         }
 
         outbuf[(counter-2)/2] = '\0';
@@ -470,11 +473,25 @@
         }
         else
         {
+            g_free(buffer);
             g_free(outbuf);
             return NULL;    /* XXX wrong encoding */
         }
     }
 
+    section_name = g_string_new("");
+    key_name = g_string_new(NULL);
+    value = g_string_new(NULL);
+
+    ini_file = g_hash_table_new_full(NULL, NULL, NULL,
+                                     close_ini_file_free_section);
+    section = g_hash_table_new_full(NULL, NULL, NULL,
+                                    close_ini_file_free_value);
+    /* make a nameless section which should store all entries that are not
+     * embedded in a section */
+    section_hash = GINT_TO_POINTER(g_string_hash(section_name));
+    g_hash_table_insert(ini_file, section_hash, section);
+
     while (off < filesize)
     {
         /* ignore the following characters */
@@ -532,7 +549,8 @@
                     section = g_hash_table_lookup(ini_file, section_hash);
                 else
                 {
-                    section = g_hash_table_new(NULL, NULL);
+                    section = g_hash_table_new_full(NULL, NULL, NULL,
+                                                    close_ini_file_free_value);
                     g_hash_table_insert(ini_file, section_hash, section);
                 }
 
@@ -578,18 +596,23 @@
     return ini_file;
 }
 
+/**
+ * Frees the memory allocated for inifile.
+ */
 void
 close_ini_file(INIFile *inifile)
 {
     g_return_if_fail(inifile);
-
-    /* we don't have to destroy anything in the hash table manually, as the
-     * keys are represented as integers and the string values may be used in
-     * functions which have read the strings from the hash table
-     */
     g_hash_table_destroy(inifile);
 }
 
+/**
+ * Returns a string that corresponds to correct section and key in inifile.
+ *
+ * Returns NULL if value was not found in inifile. Otherwise returns a copy
+ * of string pointed by "section" and "key". Returned string should be freed
+ * after use.
+ */
 gchar *
 read_ini_string(INIFile *inifile, const gchar *section, const gchar *key)
 {
@@ -612,7 +635,8 @@
     section_table = g_hash_table_lookup(inifile, section_hash);
 
     if (section_table) {
-        value = g_hash_table_lookup(section_table, GINT_TO_POINTER(key_hash));
+        value = g_strdup(g_hash_table_lookup(section_table,
+                                             GINT_TO_POINTER(key_hash)));
     }
 
     g_string_free(section_string, TRUE);