Bug#372722: diff for 3.6.2-1.1 NMU

[Steinar H. Gunderson]

Package: gtkhtml3.6
Version: 3.6.2-1
Severity: normal
Tags: patch

Hi,

Attached is the diff for my gtkhtml3.6 3.6.2-1.1 NMU.

diff -Nru /tmp/OvgTDquKTf/gtkhtml3.6-3.6.2/debian/changelog 
/tmp/NZfMgyLmSP/gtkhtml3.6-3.6.2/debian/changelog
--- /tmp/OvgTDquKTf/gtkhtml3.6-3.6.2/debian/changelog   2006-06-11 
12:16:00.000000000 +0200
+++ /tmp/NZfMgyLmSP/gtkhtml3.6-3.6.2/debian/changelog   2006-06-11 
12:16:01.000000000 +0200
@@ -1,3 +1,12 @@
+gtkhtml3.6 (3.6.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Backport patch from gtkhtml3.8 to fix cases where memory never allocated
+    with g_alloc() was fed to g_free(), causing glibc aborts.
+    (Closes: #358713)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]>  Sun, 11 Jun 2006 11:36:01 +0200
+
 gtkhtml3.6 (3.6.2-1) unstable; urgency=low
 
   * New upstream release
diff -Nru /tmp/OvgTDquKTf/gtkhtml3.6-3.6.2/src/htmltextslave.c 
/tmp/NZfMgyLmSP/gtkhtml3.6-3.6.2/src/htmltextslave.c
--- /tmp/OvgTDquKTf/gtkhtml3.6-3.6.2/src/htmltextslave.c        2005-03-23 
13:03:21.000000000 +0100
+++ /tmp/NZfMgyLmSP/gtkhtml3.6-3.6.2/src/htmltextslave.c        2006-06-11 
12:16:01.000000000 +0200
@@ -603,9 +603,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);
                                
                        }
 
@@ -625,11 +623,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;