git.maemo.org Git - oespirit1/blob - gtkhtml/gtkhtml_250_back_out_of_regex_search.diff

   1 diff -ru gtkhtml-3.24.4/gtkhtml/htmlengine-search.c gtkhtml-3.24.4/gtkhtml/htmlengine-search.c
   2 diff -ru gtkhtml-3.24.4/gtkhtml/htmlengine-search.c gtkhtml-3.24.4/gtkhtml/htmlengine-search.c
   3 diff -ru gtkhtml-3.24.4/gtkhtml/htmlengine-search.c gtkhtml-3.24.4/gtkhtml/htmlengine-search.c
   4 diff -ru gtkhtml-3.24.4/gtkhtml/htmlengine-search.c gtkhtml-3.24.4/gtkhtml/htmlengine-search.c
   5 --- gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-07-31 14:25:35.000000000 +0300
   6 --- gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-07-31 14:25:35.000000000 +0300
   7 --- gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-07-31 14:25:35.000000000 +0300
   8 --- gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-07-31 14:25:35.000000000 +0300
   9 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-07-31 14:27:45.000000000 +0300
  10 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-07-31 14:27:45.000000000 +0300
  11 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-07-31 14:27:45.000000000 +0300
  12 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-07-31 14:27:45.000000000 +0300
  13 @@ -153,6 +153,9 @@
  14         }
  15
  16         info = e->search_info = html_search_new (e, text, case_sensitive, forward, regular);
  17 +       if (!info) {
  18 +               return FALSE;
  19 +       }
  20
  21         p = e->search_info->stack ? HTML_OBJECT (e->search_info->stack->data)->parent : NULL;
  22         o = p ? p : e->clue;
  23 diff -ru gtkhtml-3.24.4/gtkhtml/htmlsearch.c gtkhtml-3.24.4/gtkhtml/htmlsearch.c
  24 diff -ru gtkhtml-3.24.4/gtkhtml/htmlsearch.c gtkhtml-3.24.4/gtkhtml/htmlsearch.c
  25 diff -ru gtkhtml-3.24.4/gtkhtml/htmlsearch.c gtkhtml-3.24.4/gtkhtml/htmlsearch.c
  26 diff -ru gtkhtml-3.24.4/gtkhtml/htmlsearch.c gtkhtml-3.24.4/gtkhtml/htmlsearch.c
  27 --- gtkhtml-3.24.4/gtkhtml/htmlsearch.c 2007-07-31 14:25:34.000000000 +0300
  28 --- gtkhtml-3.24.4/gtkhtml/htmlsearch.c 2007-07-31 14:25:34.000000000 +0300
  29 --- gtkhtml-3.24.4/gtkhtml/htmlsearch.c 2007-07-31 14:25:34.000000000 +0300
  30 --- gtkhtml-3.24.4/gtkhtml/htmlsearch.c 2007-07-31 14:25:34.000000000 +0300
  31 +++ gtkhtml-3.24.4/gtkhtml/htmlsearch.c 2007-07-31 14:28:24.000000000 +0300
  32 +++ gtkhtml-3.24.4/gtkhtml/htmlsearch.c 2007-07-31 14:28:24.000000000 +0300
  33 +++ gtkhtml-3.24.4/gtkhtml/htmlsearch.c 2007-07-31 14:28:24.000000000 +0300
  34 +++ gtkhtml-3.24.4/gtkhtml/htmlsearch.c 2007-07-31 14:28:24.000000000 +0300
  35 @@ -100,6 +100,11 @@
  36                 rv = re_compile_pattern (ns->text, ns->text_bytes, ns->reb);
  37                 if (rv) {
  38                         g_warning (rv);
  39 +
  40 +                       g_free(ns->reb);
  41 +                       ns->reb = NULL;
  42 +                       html_search_destroy(ns);
  43 +                       ns = NULL;
  44                 }
  45  #else
  46                 int rv_int;
  47 @@ -114,6 +119,11 @@
  48                         } else {
  49                                 g_warning ("regcomp failed, error code %d", rv_int);
  50                         }
  51 +
  52 +                       g_free(ns->reb);
  53 +                       ns->reb = NULL;
  54 +                       html_search_destroy(ns);
  55 +                       ns = NULL;
  56                 }
  57  #endif
  58         } else {