[maemo-commits] [maemo-commits] r15081 - projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-01-16 16:05:33 +0200 (Wed, 16 Jan 2008)
New Revision: 15081

Added:
   projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_010_check_string.diff
Removed:
   projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_050_check_string.diff
Log:
Updated gtkhtml_050_check_string.diff: It becomes gtkhtml_010_check_string.diff

Copied: projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_010_check_string.diff (from rev 15077, projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_050_check_string.diff)
===================================================================
--- projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_050_check_string.diff	2008-01-16 13:31:40 UTC (rev 15077)
+++ projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_010_check_string.diff	2008-01-16 14:05:33 UTC (rev 15081)
@@ -0,0 +1,18 @@
+# Do not leak a string pointer
+#
+# Copyright (C) 2006 - 2007 Nokia Corporation.
+# This file is distributed under the terms of GNU LGPL license, either version 2
+# of the License, or (at your option) any later version.
+#
+diff -ru gtkhtml-3.17.5/gtkhtml/htmlengine.c gtkhtml-3.17.5-010/gtkhtml/htmlengine.c
+--- gtkhtml-3.17.5/gtkhtml/htmlengine.c	2008-01-12 11:24:18.000000000 +0200
++++ gtkhtml-3.17.5-010/gtkhtml/htmlengine.c	2008-01-16 15:57:17.000000000 +0200
+@@ -5015,6 +5015,8 @@
+ 	e->formTextArea = NULL;
+ 	e->inOption = FALSE;
+ 	e->inTextArea = FALSE;
++	if (e->formText)
++		g_string_free(e->formText, TRUE);
+ 	e->formText = g_string_new ("");
+ 
+ 	e->flow = NULL;

Deleted: projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_050_check_string.diff
===================================================================
--- projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_050_check_string.diff	2008-01-16 13:53:55 UTC (rev 15080)
+++ projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_050_check_string.diff	2008-01-16 14:05:33 UTC (rev 15081)
@@ -1,19 +0,0 @@
-# Do not leak a string pointer
-#
-# Copyright (C) 2006 - 2007 Nokia Corporation.
-# This file is distributed under the terms of GNU LGPL license, either version 2
-# of the License, or (at your option) any later version.
-#
-diff -ru gtkhtml-3.13.91/src/htmlengine.c gtkhtml-3.13.91.mod1/src/htmlengine.c
---- gtkhtml-3.13.91/src/htmlengine.c	2007-02-15 12:41:23.000000000 +0200
-+++ gtkhtml-3.13.91.mod1/src/htmlengine.c	2007-02-15 12:46:07.000000000 +0200
-@@ -5009,7 +5009,8 @@
- 	e->formTextArea = NULL;
- 	e->inOption = FALSE;
- 	e->inTextArea = FALSE;
--	e->formText = g_string_new ("");
-+	if (NULL == e->formText)
-+		e->formText = g_string_new ("");
- 
- 	e->flow = NULL;
-