diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-07-26 09:19:37 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-07-26 09:19:37 +0000 |
| commit | c5bc6afb0c2b4f9007d94adb8fd4d629882576c7 (patch) | |
| tree | 9907d75dcf198e205a335a04b5d5aa6525da418f /ui/gtk/packet_list_store.c | |
| parent | 83821d08b3ccc7ff58853842408767e8ceeb77a4 (diff) | |
| download | wireshark-c5bc6afb0c2b4f9007d94adb8fd4d629882576c7.tar.gz | |
Exploit short-circuit evaluation, so first check variable, later call function
svn path=/trunk/; revision=44031
Diffstat (limited to 'ui/gtk/packet_list_store.c')
| -rw-r--r-- | ui/gtk/packet_list_store.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c index 63838a2ae8..c71f6b22db 100644 --- a/ui/gtk/packet_list_store.c +++ b/ui/gtk/packet_list_store.c @@ -1187,8 +1187,8 @@ packet_list_dissect_and_cache_record(PacketList *packet_list, PacketListRecord * return; /* error reading the frame */ } - create_proto_tree = (color_filters_used() && dissect_color) || - (have_custom_cols(cinfo) && dissect_columns); + create_proto_tree = (dissect_color && color_filters_used()) || + (dissect_columns && have_custom_cols(cinfo)); epan_dissect_init(&edt, create_proto_tree, |