[rhythmbox] metadata: don't g_free GValues allocated with GSlice



commit 0cf2bcb6698b7d164016318e92ed69726a9ee39f
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sat Aug 1 09:21:29 2009 +1000

    metadata: don't g_free GValues allocated with GSlice
    
    Fixes metadata helper crashes when importing files with duplicate tags
    (usually id3v1) and such.  Fixes lp#396405.

 metadata/rb-metadata-gst.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/metadata/rb-metadata-gst.c b/metadata/rb-metadata-gst.c
index a5a6d43..77bbbe3 100644
--- a/metadata/rb-metadata-gst.c
+++ b/metadata/rb-metadata-gst.c
@@ -367,7 +367,7 @@ rb_metadata_gst_load_tag (const GstTagList *list, const gchar *tag, RBMetaData *
 			  g_type_name (G_VALUE_TYPE (val)),
 			  g_type_name (G_VALUE_TYPE (newval)));
 		g_value_unset (newval);
-		g_free (newval);
+		g_slice_free (GValue, newval);
 		return;
 	}
 
@@ -384,7 +384,7 @@ rb_metadata_gst_load_tag (const GstTagList *list, const gchar *tag, RBMetaData *
 			rb_debug ("Got invalid UTF-8 tag data");
 			g_free (str);
 			g_value_unset (newval);
-			g_free (newval);
+			g_slice_free (GValue, newval);
 			return;
 		}
 		str = g_strstrip (str);
@@ -402,7 +402,7 @@ rb_metadata_gst_load_tag (const GstTagList *list, const gchar *tag, RBMetaData *
 					rb_debug ("Got shorter duplicate tag");
 					g_free (str);
 					g_value_unset (newval);
-					g_free (newval);
+					g_slice_free (GValue, newval);
 					return;
 				}
 			}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]