GTK: fix link button double free....

chrome/browser/gtk/gtk_chrome_link_button.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 
 #include <stdlib.h>
 
 #include "base/logging.h"
 #include "chrome/common/gtk_util.h"
@@ skipping 15 matching lines @@
       "style \"chrome-link-button\" {"
       "  GtkButton::inner-border = {0, 0, 0, 0}"
       "  GtkButton::child-displacement-x = 0"
       "  GtkButton::child-displacement-y = 0"
       "  xthickness = 0"
       "  ythickness = 0"
       "}"
       "widget_class \"*.<GtkChromeLinkButton>\" style \"chrome-link-button\"");
 }
 
+static void gtk_chrome_link_button_destroy_text_resources(
+    GtkChromeLinkButton* button) {
+  g_free(button->native_markup);
+  button->native_markup = NULL;
+  g_free(button->normal_markup);
+  button->normal_markup = NULL;
+  g_free(button->pressed_markup);
+  button->pressed_markup = NULL;
+
+  g_free(button->text);
+  button->text = NULL;
+}
+
 }  // namespace
 
 G_BEGIN_DECLS
 G_DEFINE_TYPE(GtkChromeLinkButton, gtk_chrome_link_button, GTK_TYPE_BUTTON)
 
 // Should be called after we are realized so that the "link-color" property
 // can be read.
 static void gtk_chrome_link_button_set_text(GtkChromeLinkButton* button) {
   // We only set the markup once.
   if (button->normal_markup)
     return;
 
   gchar* text = button->text;
   gboolean uses_markup = button->uses_markup;
 
   if (!uses_markup) {
     button->normal_markup = g_markup_printf_escaped(kLinkMarkup,
                                                     button->normal_color,
                                                     text);
     button->pressed_markup = g_markup_printf_escaped(kLinkMarkup, "red", text);
   } else {
-    int length = strlen(kLinkMarkup) + 9 + strlen(text) + 1;
-    button->normal_markup = static_cast<gchar*>(g_malloc(length));
-    snprintf(button->normal_markup, length, kLinkMarkup, button->normal_color,
-             text);
+    button->normal_markup = g_strdup_printf(kLinkMarkup, button->normal_color,
+                                            text);
 
-    length = strlen(kLinkMarkup) + strlen("red") + strlen(text) + 1;
-    button->pressed_markup = static_cast<gchar*>(g_malloc(length));
-    snprintf(button->pressed_markup, length, kLinkMarkup, "red", text);
+    button->pressed_markup = g_strdup_printf(kLinkMarkup, "red", text);
   }
 
   // Get the current GTK theme's link button text color.
   GdkColor* native_color = NULL;
   gtk_widget_style_get(GTK_WIDGET(button), "link-color", &native_color, NULL);
 
   if (native_color) {
     gchar color_spec[9];
     snprintf(color_spec, 9, "#%02X%02X%02X", native_color->red / 257,
              native_color->green / 257, native_color->blue / 257);
     gdk_color_free(native_color);
 
     if (!uses_markup) {
       button->native_markup = g_markup_printf_escaped(kLinkMarkup,
           color_spec, text);
     } else {
-      int length = strlen(kLinkMarkup) + strlen(color_spec) + strlen(text) + 1;
-      button->native_markup = static_cast<gchar*>(g_malloc(length));
-      snprintf(button->native_markup, length, kLinkMarkup, color_spec, text);
+      button->native_markup = g_strdup_printf(kLinkMarkup, color_spec, text);
     }
   } else {
     // If the theme doesn't have a link color, just use blue. This matches the
     // default for GtkLinkButton.
-    button->native_markup = button->normal_markup;
+    button->native_markup = g_strdup(button->normal_markup);
   }
 
   gtk_label_set_markup(GTK_LABEL(button->label),
       button->using_native_theme ? button->native_markup :
       button->normal_markup);
 }
 
 static gboolean gtk_chrome_link_button_expose(GtkWidget* widget,
                                               GdkEventExpose* event) {
   GtkChromeLinkButton* button = GTK_CHROME_LINK_BUTTON(widget);
@@ skipping 33 matching lines @@
   gdk_window_set_cursor(widget->window, link_button->hand_cursor);
 }
 
 static void gtk_chrome_link_button_leave(GtkButton* button) {
   GtkWidget* widget = GTK_WIDGET(button);
   gdk_window_set_cursor(widget->window, NULL);
 }
 
 static void gtk_chrome_link_button_destroy(GtkObject* object) {
   GtkChromeLinkButton* button = GTK_CHROME_LINK_BUTTON(object);
-  if (button->native_markup && (button->native_markup != button->normal_markup))
-    g_free(button->native_markup);
-  button->native_markup = NULL;
-  if (button->normal_markup) {
-    g_free(button->normal_markup);
-    button->normal_markup = NULL;
-  }
-  if (button->pressed_markup) {
-    g_free(button->pressed_markup);
-    button->pressed_markup = NULL;
-  }
+
+  gtk_chrome_link_button_destroy_text_resources(button);
+
   if (button->hand_cursor) {
     gdk_cursor_unref(button->hand_cursor);
     button->hand_cursor = NULL;
   }
 
-  free(button->text);
-  button->text = NULL;
-
   GTK_OBJECT_CLASS(gtk_chrome_link_button_parent_class)->destroy(object);
 }
 
 static void gtk_chrome_link_button_class_init(
     GtkChromeLinkButtonClass* link_button_class) {
   GtkWidgetClass* widget_class =
       reinterpret_cast<GtkWidgetClass*>(link_button_class);
   GtkButtonClass* button_class =
       reinterpret_cast<GtkButtonClass*>(link_button_class);
   GtkObjectClass* object_class =
@@ skipping 19 matching lines @@
   button->using_native_theme = TRUE;
   button->hand_cursor = gtk_util::GetCursor(GDK_HAND2);
   button->text = NULL;
 
   gtk_container_add(GTK_CONTAINER(button), button->label);
   gtk_widget_set_app_paintable(GTK_WIDGET(button), TRUE);
 }
 
 GtkWidget* gtk_chrome_link_button_new(const char* text) {
   GtkWidget* lb = GTK_WIDGET(g_object_new(GTK_TYPE_CHROME_LINK_BUTTON, NULL));
-  GTK_CHROME_LINK_BUTTON(lb)->text = strdup(text);
+  GTK_CHROME_LINK_BUTTON(lb)->text = g_strdup(text);
   GTK_CHROME_LINK_BUTTON(lb)->uses_markup = FALSE;
   return lb;
 }
 
 GtkWidget* gtk_chrome_link_button_new_with_markup(const char* markup) {
   GtkWidget* lb = GTK_WIDGET(g_object_new(GTK_TYPE_CHROME_LINK_BUTTON, NULL));
-  GTK_CHROME_LINK_BUTTON(lb)->text = strdup(markup);
+  GTK_CHROME_LINK_BUTTON(lb)->text = g_strdup(markup);
   GTK_CHROME_LINK_BUTTON(lb)->uses_markup = TRUE;
   return lb;
 }
 
 void gtk_chrome_link_button_set_use_gtk_theme(GtkChromeLinkButton* button,
                                               gboolean use_gtk) {
   if (use_gtk != button->using_native_theme) {
     button->using_native_theme = use_gtk;
     if (GTK_WIDGET_VISIBLE(button))
       gtk_widget_queue_draw(GTK_WIDGET(button));
   }
 }
 
 void gtk_chrome_link_button_set_label(GtkChromeLinkButton* button,
                                       const char* text) {
-  if (button->text) {
-    free(button->text);
-  }
-  button->text = strdup(text);
-
   // Clear the markup so we can redraw.
-  if (button->native_markup && (button->native_markup != button->normal_markup))
-    g_free(button->native_markup);
-  button->native_markup = NULL;
-  if (button->normal_markup) {
-    g_free(button->normal_markup);
-    button->normal_markup = NULL;
-  }
-  if (button->pressed_markup) {
-    g_free(button->pressed_markup);
-    button->pressed_markup = NULL;
-  }
+  gtk_chrome_link_button_destroy_text_resources(button);
+  button->text = g_strdup(text);
 
   if (GTK_WIDGET_VISIBLE(button))
     gtk_widget_queue_draw(GTK_WIDGET(button));
 }
 
 void gtk_chrome_link_button_set_normal_color(GtkChromeLinkButton* button,
                                              const GdkColor* color) {
-  if (button->normal_markup) {
-    g_free(button->normal_markup);
-    button->normal_markup = NULL;
-  }
+  g_free(button->normal_markup);
+  button->normal_markup = NULL;
 
   if (color) {
     snprintf(button->normal_color, 9, "#%02X%02X%02X", color->red / 257,
              color->green / 257, color->blue / 257);
   } else {
     strncpy(button->normal_color, "blue", 9);
   }
 
   if (GTK_WIDGET_VISIBLE(button))
     gtk_widget_queue_draw(GTK_WIDGET(button));
 }
 
 G_END_DECLS