diff options
| author | Evan Huus <eapache@gmail.com> | 2014-06-15 15:06:50 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-16 15:25:53 +0000 |
| commit | 83f9cc6603387c8394060b36e719651bb87b6c6b (patch) | |
| tree | 23a6d9408ec8c8433a7cfa756a081809489040e0 /ui | |
| parent | e46c1af0f00a9e76eb90672f03b36d13f8183e61 (diff) | |
Remove last caller of se_strdup_printf
Also remove that function as it is now unused.
Fix what appeared to be a memory leak in the manual address resolution dialog
while in the neighbourhood.
Change-Id: I75128ab0f95e5a7673f92bfeea45191f00581c25
Reviewed-on: https://code.wireshark.org/review/2244
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/main.c | 4 | ||||
| -rw-r--r-- | ui/gtk/manual_addr_resolv.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 79c5b92dab..293767ecf1 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -555,13 +555,13 @@ get_ip_address_list_from_packet_list_row(gpointer data) /* First check selected column */ if (is_address_column (column)) { - addr_list = g_list_append (addr_list, se_strdup_printf("%s", cfile.cinfo.col_expr.col_expr_val[column])); + addr_list = g_list_append (addr_list, g_strdup_printf("%s", cfile.cinfo.col_expr.col_expr_val[column])); } for (col = 0; col < cfile.cinfo.num_cols; col++) { /* Then check all columns except the selected */ if ((col != column) && (is_address_column (col))) { - addr_list = g_list_append (addr_list, se_strdup_printf("%s", cfile.cinfo.col_expr.col_expr_val[col])); + addr_list = g_list_append (addr_list, g_strdup_printf("%s", cfile.cinfo.col_expr.col_expr_val[col])); } } diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c index 2bdebaeca1..e2bb976f83 100644 --- a/ui/gtk/manual_addr_resolv.c +++ b/ui/gtk/manual_addr_resolv.c @@ -139,7 +139,9 @@ manual_addr_resolv_dlg(GtkWidget *w _U_, gpointer data) addr_list = get_ip_address_list_from_packet_list_row(data); for (addr_entry = addr_list; addr_entry != NULL; addr_entry = g_list_next(addr_entry)) { gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(addr_cb), (const gchar *)addr_entry->data); + g_free(addr_entry->data); } + g_list_free(addr_entry); gtk_combo_box_set_active(GTK_COMBO_BOX(addr_cb), 0); } ws_gtk_grid_attach_defaults(GTK_GRID(grid), addr_cb, 1, 0, 1, 1); |