diff --git a/ChangeLog b/ChangeLog
index f54748cc4f..a98c8f8e14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-26  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtktextbufferserialize.c (parse_info_free): don't g_free()
+	the members of info->tag_stack since they are a) gobjects and b)
+	not even owned by us, ugh... Fixes crash when deserializing fails.
+
 2008-02-26  Sven Neumann  <sven@gimp.org>
 
 	* docs/tools/shooter.c (find_toplevel_window)
@@ -45,10 +51,10 @@
 
 2008-02-22  Dominic Lachowicz  <domlachowicz@gmail.com>
 
-	* gdk-pixbuf/queryloaders.c (loader_sanity_check): It's perfectly acceptable
-	for a module to only support the save_to_callback() method if it marks itself
-	as WRITABLE
-	
+	* gdk-pixbuf/queryloaders.c (loader_sanity_check): It's perfectly
+	acceptable for a module to only support the save_to_callback()
+	method if it marks itself as WRITABLE
+
 2008-02-16  Matthias Clasen  <mclasen@redhat.com>
 	
 	* configure.in: Bump version
diff --git a/gtk/gtktextbufferserialize.c b/gtk/gtktextbufferserialize.c
index 217208c4b4..c36409b4fd 100644
--- a/gtk/gtktextbufferserialize.c
+++ b/gtk/gtktextbufferserialize.c
@@ -1625,17 +1625,8 @@ text_span_free (TextSpan *span)
 static void
 parse_info_free (ParseInfo *info)
 {
-  GSList *slist;
   GList *list;
 
-  slist = info->tag_stack;
-  while (slist)
-    {
-      g_free (slist->data);
-
-      slist = slist->next;
-    }
-
   g_slist_free (info->tag_stack);
   g_slist_free (info->states);