diff options
| -rw-r--r-- | epan/column-utils.c | 3 | ||||
| -rw-r--r-- | sharkd.c | 1 | ||||
| -rw-r--r-- | tshark.c | 1 | ||||
| -rw-r--r-- | ui/gtk/main.c | 1 | ||||
| -rw-r--r-- | wireshark-qt.cpp | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 1e1f46e86b..175fbe7adb 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -122,7 +122,8 @@ col_cleanup(column_info *cinfo) */ g_free((gchar **)cinfo->col_expr.col_expr); g_free(cinfo->col_expr.col_expr_val); - g_regex_unref(cinfo->prime_regex); + if (cinfo->prime_regex) + g_regex_unref(cinfo->prime_regex); } /* Initialize the data structures for constructing column data. */ @@ -297,6 +297,7 @@ main(int argc, char *argv[]) ret = sharkd_loop(); clean_exit: + col_cleanup(&cfile.cinfo); return ret; } @@ -2200,6 +2200,7 @@ clean_exit: #ifdef HAVE_LIBPCAP capture_opts_cleanup(&global_capture_opts); #endif + col_cleanup(&cfile.cinfo); return exit_status; } diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 939f8d021a..b62ffd35b9 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -2814,6 +2814,7 @@ clean_exit: #ifdef HAVE_LIBPCAP capture_opts_cleanup(&global_capture_opts); #endif + col_cleanup(&cfile.cinfo); return ret; } diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 827171a309..eaf2e0e307 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -946,6 +946,7 @@ clean_exit: #ifdef HAVE_LIBPCAP capture_opts_cleanup(&global_capture_opts); #endif + col_cleanup(&CaptureFile::globalCapFile()->cinfo); return ret_val; } |