diff options
author | Michael Mann <mmann78@netscape.net> | 2016-02-26 17:10:02 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-03-01 14:00:53 +0000 |
commit | 64a5cd9ce0e7e8ed1114dc86550e5888e70767e8 (patch) | |
tree | 1566f833741c91909c98892b6de18f2c5d4e3a75 /wiretap/wtap.c | |
parent | e326e85a88967760d47aba5029cb70449d9d6e28 (diff) | |
download | wireshark-64a5cd9ce0e7e8ed1114dc86550e5888e70767e8.tar.gz |
Prevent use-after-free issues with pcapng.c/wtap_opttypes.c
Bug: 12173
Change-Id: Ifff28491073d50e088b26847830a3bc8835f4282
Reviewed-on: https://code.wireshark.org/review/14180
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wiretap/wtap.c')
-rw-r--r-- | wiretap/wtap.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index cdb031ef7c..7ab03537ab 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1180,10 +1180,8 @@ wtap_fdclose(wtap *wth) void wtap_close(wtap *wth) { - guint i, j; + guint i; wtap_optionblock_t wtapng_if_descr; - wtap_optionblock_t if_stats; - wtapng_if_descr_mandatory_t* wtapng_if_descr_mand; wtap_sequential_close(wth); @@ -1205,11 +1203,6 @@ wtap_close(wtap *wth) for(i = 0; i < wth->interface_data->len; i++) { wtapng_if_descr = g_array_index(wth->interface_data, wtap_optionblock_t, i); - wtapng_if_descr_mand = (wtapng_if_descr_mandatory_t*)wtap_optionblock_get_mandatory_data(wtapng_if_descr); - for(j = 0; j < wtapng_if_descr_mand->num_stat_entries; j++) { - if_stats = g_array_index(wtapng_if_descr_mand->interface_statistics, wtap_optionblock_t, j); - wtap_optionblock_free(if_stats); - } wtap_optionblock_free(wtapng_if_descr); } g_array_free(wth->interface_data, TRUE); |