diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-07-22 21:06:46 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-07-22 21:06:46 +0000 |
commit | ac46b9cf5bc6a2ac0717f1bf16d3960dbb745eca (patch) | |
tree | ee2212889a7cb0f0e29b5d85ed2319ae52c9597a /ui/gtk/manual_addr_resolv.c | |
parent | 01e69df536cc1e8428c987e0db7dcf26114f5986 (diff) | |
download | wireshark-ac46b9cf5bc6a2ac0717f1bf16d3960dbb745eca.tar.gz |
Fix some memory leaks of returned string from gtk_combo_box_text_get_active_text()
gtk_combo_box_text_get_active_text() and gtk_combo_box_get_active_text() [from old-gtk-compat.h]
returns *newly allocated string (...) must be freed with g_free().*
svn path=/trunk/; revision=43918
Diffstat (limited to 'ui/gtk/manual_addr_resolv.c')
-rw-r--r-- | ui/gtk/manual_addr_resolv.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c index bdb54b8774..a643a1ae2e 100644 --- a/ui/gtk/manual_addr_resolv.c +++ b/ui/gtk/manual_addr_resolv.c @@ -54,7 +54,8 @@ static void man_addr_resolv_ok (GtkWidget *w _U_, gpointer data _U_) { GtkWidget *addr_cb, *name_te, *resolv_cb; - const gchar *addr, *name; + const gchar *name; + gchar *addr; gboolean active, redissect = FALSE; addr_cb = g_object_get_data (G_OBJECT(man_addr_resolv_dlg), "address"); name_te = g_object_get_data (G_OBJECT(man_addr_resolv_dlg), "name"); @@ -67,11 +68,13 @@ man_addr_resolv_ok (GtkWidget *w _U_, gpointer data _U_) GtkWidget *dialog = simple_dialog (ESD_TYPE_ERROR, ESD_BTN_OK, "Illegal IP address: \"%s\".", addr); simple_dialog_set_cb (dialog, man_addr_ill_addr_cb, NULL); + g_free(addr); return; } else { redissect = TRUE; } } + g_free(addr); resolv_cb = g_object_get_data (G_OBJECT(man_addr_resolv_dlg), "resolv"); active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resolv_cb)); @@ -93,7 +96,7 @@ static void changed_cb(GtkWidget *w _U_, GtkWidget *ok_bt) { const gchar *name; - const gchar *addr; + gchar *addr; GtkWidget *addr_cb, *name_cb, *resolv_cb; gboolean active; @@ -106,6 +109,7 @@ changed_cb(GtkWidget *w _U_, GtkWidget *ok_bt) active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resolv_cb)); gtk_widget_set_sensitive (ok_bt, strlen(name) > 0 && strlen(addr) && active ? TRUE : FALSE); + g_free(addr); } void |