vcs.maemo.org Git - oespirit1/blob - gtkhtml/gtkhtml_300_coverity_findings.diff

   1 diff -ru gtkhtml-3.24.4/gtkhtml/gtkhtml.c gtkhtml-3.24.4/gtkhtml/gtkhtml.c
   2 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2009-04-09 10:13:35.000000000 +0200
   3 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2009-04-09 11:28:49.000000000 +0200
   4 @@ -960,14 +960,14 @@
   5  {
   6         HTMLEngine *engine = GTK_HTML (widget)->engine;
   7
   8 +  if (!engine)
   9 +    return;
  10 +
  11         /* we don't need to set font's in idle time so call idle callback directly to avoid
  12            recalculating whole document
  13         */
  14 -       if (engine) {
  15 -               gtk_html_set_fonts (GTK_HTML (widget), engine->painter);
  16 -               html_engine_refresh_fonts (engine);
  17 -       }
  18 -
  19 +       gtk_html_set_fonts (GTK_HTML (widget), engine->painter);
  20 +       html_engine_refresh_fonts (engine);
  21
  22         html_colorset_set_style (engine->defaultSettings->color_set, widget);
  23         html_colorset_set_unchanged (engine->settings->color_set,
  24 @@ -2555,6 +2555,7 @@
  25                                                 g_return_if_fail (link);
  26                                                 text = g_strndup (HTML_TEXT (obj)->text + link->start_index, link->end_index - link->start_index);
  27                                                 utf8 = g_strconcat (complete_url, "\n", text, NULL);
  28 +            g_free (text);
  29                                         } else
  30                                                 utf8 = g_strconcat (complete_url, "\n", complete_url, NULL);
  31
  32 @@ -2562,7 +2563,6 @@
  33                                         gtk_selection_data_set (selection_data, selection_data->target, 8,
  34                                                                 (guchar *) utf16, written_len);
  35                                         g_free (utf8);
  36 -                                       g_free (complete_url);
  37                                         GTK_HTML (widget)->priv->dnd_url = utf16;
  38                                 } else {
  39                                         gtk_selection_data_set (selection_data, selection_data->target, 8,
  40 @@ -2570,6 +2570,8 @@
  41                                         /* printf ("complete URL %s\n", complete_url); */
  42                                         GTK_HTML (widget)->priv->dnd_url = complete_url;
  43                                 }
  44 +
  45 +                               g_free (complete_url);
  46                         }
  47                 }
  48         }
  49 diff -ru gtkhtml-3.24.4/gtkhtml/htmlcheckbox.c gtkhtml-3.24.4/gtkhtml/htmlcheckbox.c
  50 --- gtkhtml-3.24.4/gtkhtml/htmlcheckbox.c       2008-10-13 10:31:38.000000000 +0200
  51 +++ gtkhtml-3.24.4/gtkhtml/htmlcheckbox.c       2009-04-09 10:50:17.000000000 +0200
  52 @@ -110,11 +110,12 @@
  53  {
  54         HTMLEmbedded *element;
  55         GtkWidget  *check;
  56 +  static char *on = "on";
  57
  58         element = HTML_EMBEDDED (checkbox);
  59
  60         if (value == NULL)
  61 -               value = g_strdup ("on");
  62 +               value = on;
  63
  64         html_embedded_init (element, HTML_EMBEDDED_CLASS (klass), parent, name, value);
  65
  66 diff -ru gtkhtml-3.24.4/gtkhtml/htmlclueflow.c gtkhtml-3.24.4/gtkhtml/htmlclueflow.c
  67 --- gtkhtml-3.24.4/gtkhtml/htmlclueflow.c       2008-10-13 10:31:38.000000000 +0200
  68 +++ gtkhtml-3.24.4/gtkhtml/htmlclueflow.c       2009-04-09 11:27:05.000000000 +0200
  69 @@ -2308,7 +2308,8 @@
  70                                         p += (info->forward) ? 1 : -1;
  71                                         } */
  72
  73 -                               while ((info->forward && index < text_bytes)
  74 +        /* index should be lesser than text_bytes - 1 */
  75 +                               while ((info->forward && index < (text_bytes - 1))
  76                                        || (!info->forward && index >= 0)) {
  77                                         rv = regexec (info->reb,
  78                                                       (gchar *) par + index,