aboutsummaryrefslogtreecommitdiffstats
path: root/tshark.c
diff options
context:
space:
mode:
authorPatrikMosko <patrikmosko95@gmail.com>2018-09-17 20:50:01 +0200
committerAnders Broman <a.broman58@gmail.com>2018-09-18 04:03:18 +0000
commit87147cd6515bab37b36fad09325de6795b2bf1da (patch)
treee50c571bec577f3e8780ea18357c87acac79854b /tshark.c
parent53ac86f8afee62ffb71ede8e1458df6e5be75c7b (diff)
tshark memory leak: g_free(cf_name) moved under 'clean_exit' label
Change-Id: Ie29af2e2ff2eac2e3a97323175391070c7bceb73 Reviewed-on: https://code.wireshark.org/review/29710 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/tshark.c b/tshark.c
index a0fcb43ba4..a152c2b191 100644
--- a/tshark.c
+++ b/tshark.c
@@ -2226,8 +2226,6 @@ main(int argc, char *argv[])
#endif
}
- g_free(cf_name);
-
if (cfile.provider.frames != NULL) {
free_frame_data_sequence(cfile.provider.frames);
cfile.provider.frames = NULL;
@@ -2245,6 +2243,7 @@ main(int argc, char *argv[])
output_fields = NULL;
clean_exit:
+ g_free(cf_name);
destroy_print_stream(print_stream);
#ifdef HAVE_LIBPCAP
capture_opts_cleanup(&global_capture_opts);