aboutsummaryrefslogtreecommitdiffstats
path: root/dumpcap.c
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2019-01-24 13:03:46 +0100
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2019-01-24 21:25:42 +0000
commit50639e924314b07755b45318cff96537f920fb92 (patch)
tree1f1d3ab5489dd08ea30f0aa3c44f4160be92d11e /dumpcap.c
parentf51821af8684ef15b925fab76f3aa7638611d66e (diff)
dumpcap: fix memleak if multi_files_on is enabled
Capture tests fail under ASAN due to leaking capture_opts->save_file. Since v2.9.0rc0-1493-g787d61c0a4, capture_opts_cleanup takes care of freeing "save_file", so avoid clearing the pointer. Change-Id: Ice90efe0959cc8016f47db20970bd2397909e28d Reviewed-on: https://code.wireshark.org/review/31727 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'dumpcap.c')
-rw-r--r--dumpcap.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/dumpcap.c b/dumpcap.c
index 26f9c08d90..78a475ab4e 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -4232,10 +4232,8 @@ error:
file. */
if (capture_opts->save_file != NULL) {
ws_unlink(capture_opts->save_file);
- g_free(capture_opts->save_file);
}
}
- capture_opts->save_file = NULL;
if (cfilter_error)
report_cfilter_error(capture_opts, error_index, errmsg);
else