summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2017-06-30 00:32:25 +0200
committerAnders Broman <a.broman58@gmail.com>2017-06-30 07:13:12 +0000
commitb58666bc8216011702baa80d1945958b28b0cda9 (patch)
tree97f9411547fa81e8cb43ed27d1282df65fecac0c
parent0930fe4cffc3f9b4a8ef9168a72fdb05c8f1bcb8 (diff)
downloadwireshark-b58666bc8216011702baa80d1945958b28b0cda9.tar.gz
dumpcap: fix minor memory leak at begin of capture
While "os_info_str" is freed after the loop, "cpu_info_str" was leaked. Change-Id: Ia4069403c0a5dd5cc6bd7ed61726c1bfa9736b19 Reviewed-on: https://code.wireshark.org/review/22465 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 247446539704aee99f64e73a77e5e88a40ae885a) Reviewed-on: https://code.wireshark.org/review/22469
-rw-r--r--dumpcap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/dumpcap.c b/dumpcap.c
index 9ed756f27d..5a21d69589 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -2434,6 +2434,7 @@ capture_loop_init_output(capture_options *capture_opts, loop_data *ld, char *err
-1, /* section_length */
&ld->bytes_written,
&err);
+ g_string_free(cpu_info_str, TRUE);
g_free(appname);
for (i = 0; successful && (i < capture_opts->ifaces->len); i++) {
@@ -2933,6 +2934,7 @@ do_file_switch_or_stop(capture_options *capture_opts,
-1, /* section_length */
&(global_ld.bytes_written),
&global_ld.err);
+ g_string_free(cpu_info_str, TRUE);
g_free(appname);
for (i = 0; successful && (i < capture_opts->ifaces->len); i++) {