Remove incorrect 'if (tree)'

Incorrect because of one or both of the following:
- col_...()/expert...() called under 'if (tree)'
- vars set under 'if (tree)' used later (not under 'if (tree)'
   as args to col_...()/expert_...()

Change-Id: I89f7d453f2d6eaa40d51cbd794ed2c9be7e549de
Reviewed-on: https://code.wireshark.org/review/6754
Reviewed-by: Bill Meier <wmeier@newsguy.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 3b25058b26..68f8a3a888 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -2075,14 +2075,12 @@ dissect_netflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
     offset += 2;
 
     pdus = tvb_get_ntohs(tvb, offset);
-    if (tree) {
-        if(ver == 10) {
-            proto_tree_add_uint(netflow_tree, hf_cflow_len, tvb, offset, 2, pdus);
-            flow_len = pdus;
-        } else {
-            proto_tree_add_uint(netflow_tree, hf_cflow_count, tvb, offset, 2, pdus);
-            flow_len = -1;
-        }
+    if(ver == 10) {
+        proto_tree_add_uint(netflow_tree, hf_cflow_len, tvb, offset, 2, pdus);
+        flow_len = pdus;
+    } else {
+        proto_tree_add_uint(netflow_tree, hf_cflow_count, tvb, offset, 2, pdus);
+        flow_len = -1;
     }
     offset += 2;