[maemo-commits] [maemo-commits] r15231 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2008-02-26 16:40:46 +0200 (Tue, 26 Feb 2008)
New Revision: 15231

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktextbufferserialize.c
Log:
2008-02-26  Michael Natterer  <mitch at imendio.com>

	Merged from upstream, fixes the crash in NB#77296:

	* 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.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-02-26 12:50:31 UTC (rev 15230)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-02-26 14:40:46 UTC (rev 15231)
@@ -1,3 +1,11 @@
+2008-02-26  Michael Natterer  <mitch at imendio.com>
+
+	Merged from upstream, fixes the crash in NB#77296:
+
+	* 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-13  Kristian Rietveld  <kris at imendio.com>
 
 	Merge from upstream, fixes NB#75384:

Modified: projects/haf/trunk/gtk+/gtk/gtktextbufferserialize.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktextbufferserialize.c	2008-02-26 12:50:31 UTC (rev 15230)
+++ projects/haf/trunk/gtk+/gtk/gtktextbufferserialize.c	2008-02-26 14:40:46 UTC (rev 15231)
@@ -1625,17 +1625,8 @@
 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);