X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=gtkhtml%2Fgtkhtml_250_back_out_of_regex_search.diff;fp=gtkhtml%2Fgtkhtml_250_back_out_of_regex_search.diff;h=2d966d7175e8935297fec6e26b14b87ca375838f;hb=7fa07252412472079f7881d10dc22107a435a4cc;hp=0000000000000000000000000000000000000000;hpb=1d976cdf3151b792335a1bed7622eb3a47d6f31a;p=oespirit1

diff --git a/gtkhtml/gtkhtml_250_back_out_of_regex_search.diff b/gtkhtml/gtkhtml_250_back_out_of_regex_search.diff
new file mode 100644
index 0000000..2d966d7
--- /dev/null
+++ b/gtkhtml/gtkhtml_250_back_out_of_regex_search.diff
@@ -0,0 +1,58 @@
+diff -ru gtkhtml-3.24.4/gtkhtml/htmlengine-search.c gtkhtml-3.24.4/gtkhtml/htmlengine-search.c
+diff -ru gtkhtml-3.24.4/gtkhtml/htmlengine-search.c gtkhtml-3.24.4/gtkhtml/htmlengine-search.c
+diff -ru gtkhtml-3.24.4/gtkhtml/htmlengine-search.c gtkhtml-3.24.4/gtkhtml/htmlengine-search.c
+diff -ru gtkhtml-3.24.4/gtkhtml/htmlengine-search.c gtkhtml-3.24.4/gtkhtml/htmlengine-search.c
+--- gtkhtml-3.24.4/gtkhtml/htmlengine-search.c	2007-07-31 14:25:35.000000000 +0300
+--- gtkhtml-3.24.4/gtkhtml/htmlengine-search.c	2007-07-31 14:25:35.000000000 +0300
+--- gtkhtml-3.24.4/gtkhtml/htmlengine-search.c	2007-07-31 14:25:35.000000000 +0300
+--- gtkhtml-3.24.4/gtkhtml/htmlengine-search.c	2007-07-31 14:25:35.000000000 +0300
++++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.c	2007-07-31 14:27:45.000000000 +0300
++++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.c	2007-07-31 14:27:45.000000000 +0300
++++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.c	2007-07-31 14:27:45.000000000 +0300
++++ gtkhtml-3.24.4/gtkhtml/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.24.4/gtkhtml/htmlsearch.c gtkhtml-3.24.4/gtkhtml/htmlsearch.c
+diff -ru gtkhtml-3.24.4/gtkhtml/htmlsearch.c gtkhtml-3.24.4/gtkhtml/htmlsearch.c
+diff -ru gtkhtml-3.24.4/gtkhtml/htmlsearch.c gtkhtml-3.24.4/gtkhtml/htmlsearch.c
+diff -ru gtkhtml-3.24.4/gtkhtml/htmlsearch.c gtkhtml-3.24.4/gtkhtml/htmlsearch.c
+--- gtkhtml-3.24.4/gtkhtml/htmlsearch.c	2007-07-31 14:25:34.000000000 +0300
+--- gtkhtml-3.24.4/gtkhtml/htmlsearch.c	2007-07-31 14:25:34.000000000 +0300
+--- gtkhtml-3.24.4/gtkhtml/htmlsearch.c	2007-07-31 14:25:34.000000000 +0300
+--- gtkhtml-3.24.4/gtkhtml/htmlsearch.c	2007-07-31 14:25:34.000000000 +0300
++++ gtkhtml-3.24.4/gtkhtml/htmlsearch.c	2007-07-31 14:28:24.000000000 +0300
++++ gtkhtml-3.24.4/gtkhtml/htmlsearch.c	2007-07-31 14:28:24.000000000 +0300
++++ gtkhtml-3.24.4/gtkhtml/htmlsearch.c	2007-07-31 14:28:24.000000000 +0300
++++ gtkhtml-3.24.4/gtkhtml/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 {