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

   1 diff -ru gtkhtml-3.24.4/gtkhtml/htmlengine.c gtkhtml-3.24.4/gtkhtml/htmlengine.c
   2 --- gtkhtml-3.24.4/gtkhtml/htmlengine.c 2009-04-09 13:15:13.000000000 +0200
   3 +++ gtkhtml-3.24.4/gtkhtml/htmlengine.c 2009-04-09 13:24:57.000000000 +0200
   4 @@ -795,13 +795,15 @@
   5  static void
   6  finish_flow (HTMLEngine *e, HTMLObject *clue) {
   7         g_return_if_fail (HTML_IS_ENGINE (e));
   8 -
   9 +
  10         if (e->flow && HTML_CLUE (e->flow)->tail == NULL) {
  11 -               html_clue_remove (HTML_CLUE (clue), e->flow);
  12 +    if (clue)
  13 +      html_clue_remove (HTML_CLUE (clue), e->flow);
  14                 html_object_destroy (e->flow);
  15                 e->flow = NULL;
  16         }
  17 -       close_flow (e, clue);
  18 +  if (clue)
  19 +   close_flow (e, clue);
  20  }
  21
  22
  23 diff -ru gtkhtml-3.24.4/gtkhtml/htmlobject.c gtkhtml-3.24.4/gtkhtml/htmlobject.c
  24 --- gtkhtml-3.24.4/gtkhtml/htmlobject.c 2008-10-13 10:31:38.000000000 +0200
  25 +++ gtkhtml-3.24.4/gtkhtml/htmlobject.c 2009-04-09 13:26:02.000000000 +0200
  26 @@ -57,7 +57,9 @@
  27  static void
  28  destroy (HTMLObject *self)
  29  {
  30 -#define GTKHTML_MEM_DEBUG 1
  31 +  if (!self)
  32 +    return;
  33 +/* #define GTKHTML_MEM_DEBUG 1 */
  34  #if GTKHTML_MEM_DEBUG
  35         self->parent = HTML_OBJECT (0xdeadbeef);
  36         self->next = HTML_OBJECT (0xdeadbeef);