rpms/gtkhtml3/devel gtkhtml-3.9.90-free.patch, NONE, 1.1 gtkhtml3.spec, 1.51, 1.52

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30133

Modified Files:
	gtkhtml3.spec 
Added Files:
	gtkhtml-3.9.90-free.patch 
Log Message:
Fix a crash


gtkhtml-3.9.90-free.patch:
 htmltextslave.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gtkhtml-3.9.90-free.patch ---
--- gtkhtml-3.9.90/src/htmltextslave.c.free	2006-01-31 09:36:48.000000000 -0500
+++ gtkhtml-3.9.90/src/htmltextslave.c	2006-01-31 09:46:10.000000000 -0500
@@ -605,9 +605,7 @@
 				tmp_gi = pango_glyph_item_split (&glyph_item->glyph_item, slave->owner->text, split_index);
 
 				/* free the beginning we don't need */
-				pango_item_free (tmp_gi->item);
-				pango_glyph_string_free (tmp_gi->glyphs);
-				g_free (tmp_gi);
+				pango_glyph_item_free (tmp_gi);
 				
 			}
 
@@ -627,11 +625,13 @@
 				tmp_gi2 = pango_glyph_item_split (&tmp_gi1, slave->owner->text, split_index);
 
 				glyph_item->glyph_item = *tmp_gi2;
+				tmp_gi2->item = NULL;
+				tmp_gi2->glyphs = NULL;
 
 				/* free the tmp1 content and tmp2 container, but not the content */
 				pango_item_free (tmp_gi1.item);
 				pango_glyph_string_free (tmp_gi1.glyphs);
-				g_free (tmp_gi2);
+				pango_glyph_item_free (tmp_gi2);
 
 				glyph_item->type = HTML_TEXT_SLAVE_GLYPH_ITEM_CREATED;
 				glyph_item->widths = NULL;


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gtkhtml3.spec	30 Jan 2006 23:06:12 -0000	1.51
+++ gtkhtml3.spec	31 Jan 2006 14:53:32 -0000	1.52
@@ -5,7 +5,7 @@
 Summary: gtkhtml library
 Name: gtkhtml3
 Version: 3.9.90
-Release: 1
+Release: 2
 License: LGPL/GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
@@ -27,6 +27,8 @@
 # Patches from bugzilla.ximian.com #65670, #66206
 Patch2: gtkhtml-3.3.2-imcommit.patch
 Patch3: gtkhtml-fix-indic-navigation-129212.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=329344
+Patch4: gtkhtml-3.9.90-free.patch
 
 %description
 GtkHTML is a lightweight HTML rendering/printing/editing engine.  It
@@ -97,6 +99,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> - 3.9.90-2
+- Fix a crash
+
 * Mon Jan 30 2006 David Malcolm <dmalcolm at redhat.com> - 3.9.90-1
 - 3.9.90