From 6c09e1cf9566a6d21cb0f0df47bf391c2e2ffc84 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 27 Apr 2011 00:43:31 +0000 Subject: Another hack to handle the one-pass case. svn path=/trunk/; revision=36880 --- tshark.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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(); -- cgit v1.2.3