[maemo-commits] [maemo-commits] r15346 - in projects/haf/trunk/gtkhtml: . debian upstream/patches

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-04-04 13:22:44 +0300 (Fri, 04 Apr 2008)
New Revision: 15346

Added:
   projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_270_memleak_fix.diff
Modified:
   projects/haf/trunk/gtkhtml/ChangeLog
   projects/haf/trunk/gtkhtml/debian/changelog
Log:
  * Plug leak in htmlengine.c based on patch from Olev Kartau
  * Fixes: NB#79361


Modified: projects/haf/trunk/gtkhtml/ChangeLog
===================================================================
--- projects/haf/trunk/gtkhtml/ChangeLog	2008-04-03 17:05:09 UTC (rev 15345)
+++ projects/haf/trunk/gtkhtml/ChangeLog	2008-04-04 10:22:44 UTC (rev 15346)
@@ -1,3 +1,8 @@
+2008-04-04  Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
+	* Plug leak in htmlengine.c based on patch from Olev Kartau
+	* Fixes: NB#79361
+
 2007-07-31  Gabriel Schulhof <gabriel.schulhof at nokia.com>
 
 	* Back out of regex search and report FALSE if regcomp fails

Modified: projects/haf/trunk/gtkhtml/debian/changelog
===================================================================
--- projects/haf/trunk/gtkhtml/debian/changelog	2008-04-03 17:05:09 UTC (rev 15345)
+++ projects/haf/trunk/gtkhtml/debian/changelog	2008-04-04 10:22:44 UTC (rev 15346)
@@ -1,3 +1,10 @@
+gtkhtml (3.13.91-3osso15) unstable; urgency=low
+
+  * Plug leak in htmlengine.c based on patch from Olev Kartau
+  * Fixes: NB#79361
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Fri,  4 Apr 2008 13:19:24 +0300
+
 gtkhtml (3.9.1-3osso13) unstable; urgency=low
 
   * Replace substring search with UTF-8-aware upstream version

Added: projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_270_memleak_fix.diff
===================================================================
--- projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_270_memleak_fix.diff	2008-04-03 17:05:09 UTC (rev 15345)
+++ projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_270_memleak_fix.diff	2008-04-04 10:22:44 UTC (rev 15346)
@@ -0,0 +1,14 @@
+--- gtkhtml-3.13.91/src/htmlengine.c	2008-03-31 11:50:14.000000000 +0300
++++ gtkhtml-3.13.91.fixed/src/htmlengine.c	2008-03-31 10:45:51.000000000 +0300
+@@ -2575,8 +2575,10 @@
+ 	element->style = html_style_set_display (element->style, DISPLAY_NONE);
+ 
+ 	/* FIXME fixup missing url */
+-	if (!tmpurl)
++	if (!tmpurl) {
++		html_element_free (element);
+ 		return;
++	}
+ 	
+ 	if (align != HTML_HALIGN_NONE)
+ 		valign = HTML_VALIGN_BOTTOM;