diff options
| author | Evan Huus <eapache@gmail.com> | 2015-07-05 14:56:45 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-07-06 00:26:03 +0000 |
| commit | 35399887f41d6c5fb42f18a5ce85553d2522d3a6 (patch) | |
| tree | d86390fd6dc397031f35137cd0f4b76615144034 /epan | |
| parent | ef1f0c167b37fba63ae9b4e1474ddc7da5f5d370 (diff) | |
prefs: fix memory leak reading capture columns
Change-Id: I925ec3329cc099a5f3d2ae66e43b06fc52309dc8
Reviewed-on: https://code.wireshark.org/review/9504
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/prefs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index 697e54794d..9bd1ac74e0 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1822,9 +1822,9 @@ capture_column_reset_cb(pref_t* pref) static prefs_set_pref_e capture_column_set_cb(pref_t* pref, const gchar* value, gboolean* changed _U_) { - GList *col_l = prefs_get_string_list(value); - GList *col_l_elt; - gchar *col_name; + GList *col_l = prefs_get_string_list(value); + GList *col_l_elt; + gchar *col_name; int i; if (col_l == NULL) @@ -1861,6 +1861,7 @@ capture_column_set_cb(pref_t* pref, const gchar* value, gboolean* changed _U_) prefs.capture_columns = g_list_append(prefs.capture_columns, col_name); } pref->varp.list = &prefs.capture_columns; + prefs_clear_string_list(col_l); return PREFS_SET_SYNTAX_ERR; } col_l_elt = col_l_elt->next; @@ -1873,6 +1874,7 @@ capture_column_set_cb(pref_t* pref, const gchar* value, gboolean* changed _U_) col_l_elt = col_l_elt->next; } pref->varp.list = &prefs.capture_columns; + g_list_free(col_l); return PREFS_SET_OK; } |