osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Evan Huus 2014-06-15 15:06:50 -04:00 committed by Michael Mann
parent e46c1af0f0
commit 83f9cc6603
4 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/emem.c
View File

@ -1018,12 +1018,6 @@ ep_strdup_vprintf(const gchar *fmt, va_list ap)
return emem_strdup_vprintf(fmt, ap, ep_alloc);
}
static gchar *
se_strdup_vprintf(const gchar* fmt, va_list ap)
{
return emem_strdup_vprintf(fmt, ap, se_alloc);
}
gchar *
ep_strdup_printf(const gchar *fmt, ...)
{
@ -1036,18 +1030,6 @@ ep_strdup_printf(const gchar *fmt, ...)
return dst;
}
gchar *
se_strdup_printf(const gchar *fmt, ...)
{
va_list ap;
gchar *dst;
va_start(ap, fmt);
dst = se_strdup_vprintf(fmt, ap);
va_end(ap);
return dst;
}
gchar **
ep_strsplit(const gchar* string, const gchar* sep, int max_tokens)
{

5
epan/emem.h
View File

@ -120,11 +120,6 @@ WS_DLL_PUBLIC
void* se_alloc0(size_t size) G_GNUC_MALLOC;
#define se_new0(type) ((type*)se_alloc0(sizeof(type)))
/* Create a formatted string with a capture lifetime scope */
WS_DLL_PUBLIC
gchar* se_strdup_printf(const gchar* fmt, ...)
G_GNUC_MALLOC G_GNUC_PRINTF(1, 2);
/** release all memory allocated */
void se_free_all(void);

4
ui/gtk/main.c
View File

@ -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]));
}
}

2
ui/gtk/manual_addr_resolv.c
View File

@ -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);