Bug#358435: diff for 3.8.1-1.1 NMU

[heikkih]

Package: gtkhtml3.8
Version: 3.8.1-1
Severity: normal
Tags: patch

Hi,

Attached is the diff for my gtkhtml3.8 3.8.1-1.1 NMU.

Sincerely,
 Heikki

diff -Nru /tmp/j1eJDUCNBU/gtkhtml3.8-3.8.1/debian/changelog 
/tmp/VO8WynLDSo/gtkhtml3.8-3.8.1/debian/changelog
--- /tmp/j1eJDUCNBU/gtkhtml3.8-3.8.1/debian/changelog   2006-03-22 
18:45:55.000000000 +0000
+++ /tmp/VO8WynLDSo/gtkhtml3.8-3.8.1/debian/changelog   2006-03-22 
18:45:55.000000000 +0000
@@ -1,3 +1,9 @@
+gtkhtml3.8 (3.8.1-1.1) unstable; urgency=low
+
+  * NMU to fix crasher (closes: #358368)
+
+ -- Heikki Henriksen <[EMAIL PROTECTED]>  Wed, 22 Mar 2006 13:57:21 +0000
+
 gtkhtml3.8 (3.8.1-1) unstable; urgency=low
 
   * New upstream release
diff -Nru /tmp/j1eJDUCNBU/gtkhtml3.8-3.8.1/src/htmltextslave.c 
/tmp/VO8WynLDSo/gtkhtml3.8-3.8.1/src/htmltextslave.c
--- /tmp/j1eJDUCNBU/gtkhtml3.8-3.8.1/src/htmltextslave.c        2005-05-03 
11:09:58.000000000 +0000
+++ /tmp/VO8WynLDSo/gtkhtml3.8-3.8.1/src/htmltextslave.c        2006-03-22 
18:45:55.000000000 +0000
@@ -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;