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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2007-07-31 15:00:11 +0300 (Tue, 31 Jul 2007)
New Revision: 12952

Added:
   projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_250_back_out_of_regex_search.diff
Modified:
   projects/haf/trunk/gtkhtml/ChangeLog
   projects/haf/trunk/gtkhtml/debian/changelog
   projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_090_dependency_removal.diff
Log:
  * Back out of regex search and report FALSE if regcomp fails
  * Fixes: NB#64191, NB#64261


Modified: projects/haf/trunk/gtkhtml/ChangeLog
===================================================================
--- projects/haf/trunk/gtkhtml/ChangeLog	2007-07-31 10:18:18 UTC (rev 12951)
+++ projects/haf/trunk/gtkhtml/ChangeLog	2007-07-31 12:00:11 UTC (rev 12952)
@@ -1,3 +1,8 @@
+2007-07-31  Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
+	* Back out of regex search and report FALSE if regcomp fails
+	* Fixes: NB#64191, NB#64261
+
 2007-07-02  Gabriel Schulhof <gabriel.schulhof at nokia.com>
 
 	* Added patch from Jose Dapena Paz for exporting last search selected area	

Modified: projects/haf/trunk/gtkhtml/debian/changelog
===================================================================
--- projects/haf/trunk/gtkhtml/debian/changelog	2007-07-31 10:18:18 UTC (rev 12951)
+++ projects/haf/trunk/gtkhtml/debian/changelog	2007-07-31 12:00:11 UTC (rev 12952)
@@ -1,3 +1,10 @@
+gtkhtml (3.9.1-3osso12) unstable; urgency=low
+
+  * Back out of regex search and report FALSE if regcomp fails
+  * Fixes: NB#64191, NB#64261
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Tue, 31 Jul 2007 14:57:12 +0300
+
 gtkhtml (3.9.1-3osso11) unstable; urgency=low
 
   * Added patch from Jose Dapena Paz for exporting last search selected area

Modified: projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_090_dependency_removal.diff
===================================================================
--- projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_090_dependency_removal.diff	2007-07-31 10:18:18 UTC (rev 12951)
+++ projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_090_dependency_removal.diff	2007-07-31 12:00:11 UTC (rev 12952)
@@ -471,45 +471,6 @@
  	engine->block = FALSE;
  	engine->block_images = FALSE;
  	engine->save_data = FALSE;
-diff -ru gtkhtml-3.13.91/src/htmlengine.c.orig gtkhtml-3.13.91-dependency-removal/src/htmlengine.c.orig
---- gtkhtml-3.13.91/src/htmlengine.c.orig	2007-05-14 19:17:46.000000000 +0300
-+++ gtkhtml-3.13.91-dependency-removal/src/htmlengine.c.orig	2007-05-14 19:17:46.000000000 +0300
-@@ -6219,9 +6219,9 @@
- html_engine_focus (HTMLEngine *e, GtkDirectionType dir)
- {
- 	if (e->clue && (dir == GTK_DIR_TAB_FORWARD || dir == GTK_DIR_TAB_BACKWARD)) {
--		HTMLObject *cur;
--		HTMLObject *focus_object;
--		gint offset;
-+		HTMLObject *cur = NULL;
-+		HTMLObject *focus_object = NULL;
-+		gint offset = 0;
- 
- 		focus_object = html_engine_get_focus_object (e, &offset);
- 		if (focus_object && html_object_is_embedded (focus_object)
-@@ -6232,9 +6232,22 @@
- 		if (focus_object)
- 			cur = move_focus_object (focus_object, &offset, e, dir);
- 		else
-+		{
- 			cur = dir == GTK_DIR_TAB_FORWARD
- 				? html_object_get_head_leaf (e->clue)
- 				: html_object_get_tail_leaf (e->clue);
-+			if (HTML_IS_TEXT (cur))
-+			{
-+				if (dir == GTK_DIR_TAB_FORWARD)
-+					html_text_first_link_offset (HTML_TEXT (cur), &offset);
-+				else
-+					html_text_last_link_offset (HTML_TEXT (cur), &offset);
-+			}
-+			else
-+				offset = (dir == GTK_DIR_TAB_FORWARD)
-+					? 0
-+					: html_object_get_length (cur);
-+		}
- 
- 		while (cur) {
- 			/* printf ("try child %p\n", cur); */
 diff -ru gtkhtml-3.13.91/src/htmlframe.c gtkhtml-3.13.91-dependency-removal/src/htmlframe.c
 --- gtkhtml-3.13.91/src/htmlframe.c	2007-01-03 17:19:57.000000000 +0200
 +++ gtkhtml-3.13.91-dependency-removal/src/htmlframe.c	2007-05-14 19:18:24.000000000 +0300

Added: projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_250_back_out_of_regex_search.diff
===================================================================
--- projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_250_back_out_of_regex_search.diff	2007-07-31 10:18:18 UTC (rev 12951)
+++ projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_250_back_out_of_regex_search.diff	2007-07-31 12:00:11 UTC (rev 12952)
@@ -0,0 +1,40 @@
+diff -ru gtkhtml-3.13.91/src/htmlengine-search.c gtkhtml-3.13.91.mod/src/htmlengine-search.c
+--- gtkhtml-3.13.91/src/htmlengine-search.c	2007-07-31 14:25:35.000000000 +0300
++++ gtkhtml-3.13.91.mod/src/htmlengine-search.c	2007-07-31 14:27:45.000000000 +0300
+@@ -153,6 +153,9 @@
+ 	}
+ 
+ 	info = e->search_info = html_search_new (e, text, case_sensitive, forward, regular);
++	if (!info) {
++		return FALSE;
++	}
+ 
+ 	p = e->search_info->stack ? HTML_OBJECT (e->search_info->stack->data)->parent : NULL;
+ 	o = p ? p : e->clue;
+diff -ru gtkhtml-3.13.91/src/htmlsearch.c gtkhtml-3.13.91.mod/src/htmlsearch.c
+--- gtkhtml-3.13.91/src/htmlsearch.c	2007-07-31 14:25:34.000000000 +0300
++++ gtkhtml-3.13.91.mod/src/htmlsearch.c	2007-07-31 14:28:24.000000000 +0300
+@@ -100,6 +100,11 @@
+ 		rv = re_compile_pattern (ns->text, ns->text_bytes, ns->reb);
+ 		if (rv) {
+ 			g_warning (rv);
++
++			g_free(ns->reb);
++			ns->reb = NULL;
++			html_search_destroy(ns);
++			ns = NULL;
+ 		}
+ #else
+ 		int rv_int;
+@@ -114,6 +119,11 @@
+ 			} else {
+ 				g_warning ("regcomp failed, error code %d", rv_int);
+ 			}
++
++			g_free(ns->reb);
++			ns->reb = NULL;
++			html_search_destroy(ns);
++			ns = NULL;
+ 		}
+ #endif
+ 	} else {