Another hack to handle the one-pass case.

svn path=/trunk/; revision=36880

1 files changed, 8 insertions, 1 deletions

diff --git a/tshark.c b/tshark.c
index 528d6e801a..4310740a43 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1816,7 +1816,14 @@ main(int argc, char *argv[])
 
   g_free(cf_name);
 
-  cap_file_free_frames(&cfile);
+  /* XXX - hack to avoid a crash in one-pass mode, where we update
+     cfile.count but don't allocate any frame_data structures.
+     We may want to more cleanly separate the "capture file" and
+     "collection of frames" stuff, to handle cases such as TShark
+     one-pass mode where we care about the former but don't care
+     about the latter. */
+  if (cfile.ptree_root != NULL)
+    cap_file_free_frames(&cfile);
 
   draw_tap_listeners(TRUE);
   funnel_dump_all_text_windows();