osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

If we're making two passes and we have a display filter applied, create 

a protocol tree in process_packet_first_pass(). Otherwise we crash with

ERROR:dfvm.c:434:dfvm_apply: assertion failed: (tree)

svn path=/trunk/; revision=43420
This commit is contained in:
Gerald Combs 2012-06-20 20:44:05 +00:00
parent 41232f172e
commit 49849233c3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tshark.c
View File

@ -2498,6 +2498,7 @@ process_packet_first_pass(capture_file *cf,
{
frame_data fdlocal;
guint32 framenum;
gboolean create_proto_tree = FALSE;
epan_dissect_t edt;
gboolean passed;
@ -2520,11 +2521,14 @@ process_packet_first_pass(capture_file *cf,
/* Grab any resolved addresses */
host_name_lookup_process(NULL);
if (cf->rfcode)
create_proto_tree = TRUE;
/* The protocol tree will be "visible", i.e., printed, only if we're
printing packet details, which is true if we're printing stuff
("print_packet_info" is true) and we're in verbose mode ("verbose"
is true). */
epan_dissect_init(&edt, FALSE, FALSE);
epan_dissect_init(&edt, create_proto_tree, FALSE);
/* If we're running a read filter, prime the epan_dissect_t with that
filter. */