summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-07-01 05:15:19 +0000
committerGuy Harris <guy@alum.mit.edu>2017-07-01 05:15:25 +0000
commitcbf219d16c3dd506cbf25ff77f240f215e1b479a (patch)
tree15a08bca21ea3bbf21e1a1c9a24d0507ecb0b71b
parentb58666bc8216011702baa80d1945958b28b0cda9 (diff)
downloadwireshark-master-2.2.tar.gz
Revert "dumpcap: fix minor memory leak at begin of capture"master-2.2
This reverts commit b58666bc8216011702baa80d1945958b28b0cda9. There's no cpu_info_str to *be* leaked in the 2.2 branch. Change-Id: I77162ac29cd4b25873e62c23a33d77aa72e70635 Reviewed-on: https://code.wireshark.org/review/22491 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--dumpcap.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/dumpcap.c b/dumpcap.c
index 5a21d69589..9ed756f27d 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -2434,7 +2434,6 @@ 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++) {
@@ -2934,7 +2933,6 @@ 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++) {