From e5fef1d73e687807ae1df40979ffc5a65dda03cc Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Sat, 10 Sep 2016 01:27:28 +0200 Subject: Fix version-string releated memleak for some CLI tools These programs resulted on a memleak report on exit. Change-Id: I630618f50d723b7af4cb00ba29671d4e7c6fcdc2 Reviewed-on: https://code.wireshark.org/review/17623 Reviewed-by: Peter Wu --- tfshark.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tfshark.c') diff --git a/tfshark.c b/tfshark.c index 49cb26ab06..bc7323eee6 100644 --- a/tfshark.c +++ b/tfshark.c @@ -420,6 +420,8 @@ main(int argc, char *argv[]) "\n" "%s", get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str); + g_string_free(comp_info_str, TRUE); + g_string_free(runtime_info_str, TRUE); /* * In order to have the -X opts assigned before the wslua machine starts @@ -854,7 +856,8 @@ main(int argc, char *argv[]) } break; case 'v': /* Show version and exit */ - { + comp_info_str = get_compiled_version_info(NULL, epan_get_compiled_version_info); + runtime_info_str = get_runtime_version_info(get_tfshark_runtime_version_info); show_version("TFShark (Wireshark)", comp_info_str, runtime_info_str); g_string_free(comp_info_str, TRUE); g_string_free(runtime_info_str, TRUE); @@ -868,7 +871,6 @@ main(int argc, char *argv[]) #endif epan_cleanup(); return 0; - } case 'O': /* Only output these protocols */ /* already processed; just ignore it now */ break; -- cgit v1.2.3