aboutsummaryrefslogtreecommitdiffstats
path: root/rawshark.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-08-23 17:10:32 +0000
committerGerald Combs <gerald@wireshark.org>2013-08-23 17:10:32 +0000
commitc431ae3d816b7d6c53bda04cfd702add8d12b223 (patch)
tree5440a1ecddd16ecc222c18e8b430741e8a9d202b /rawshark.c
parentae4f556630e205ee8c90ba66ca45b9593033f58b (diff)
Make sure we call epan_free() before epan_cleanup() similar to r51342.
svn path=/trunk/; revision=51491
Diffstat (limited to 'rawshark.c')
-rw-r--r--rawshark.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/rawshark.c b/rawshark.c
index ea48c91405..f5c4519054 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -809,6 +809,7 @@ main(int argc, char *argv[])
for (i = 0; i < n_rfilters; i++) {
if (!dfilter_compile(rfilters[i], &rfcodes[n_rfcodes])) {
cmdarg_err("%s", dfilter_error_msg);
+ epan_free(cfile.epan);
epan_cleanup();
exit(2);
}
@@ -829,6 +830,7 @@ main(int argc, char *argv[])
relinquish_special_privs_perm();
if (raw_cf_open(&cfile, pipe_name) != CF_OK) {
+ epan_free(cfile.epan);
epan_cleanup();
exit(2);
}
@@ -880,6 +882,7 @@ main(int argc, char *argv[])
err = load_cap_file(&cfile);
if (err != 0) {
+ epan_free(cfile.epan);
epan_cleanup();
exit(2);
}
@@ -889,6 +892,7 @@ main(int argc, char *argv[])
exit(2);
}
+ epan_free(cfile.epan);
epan_cleanup();
return 0;