Fix for bug 4852:

Don't short circuit dissection if tree==NULL when column values are to be set.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33282 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 2 insertions, 16 deletions

diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index 2b92bf6161..4f5071f1df 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -2,14 +2,14 @@
  * packet-ppi.c
  * Routines for PPI Packet Header dissection
  *
+ * $Id$
+ *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2007 Gerald Combs
  *
  * Copied from README.developer
  *
- * $Id$
- *
  * Copyright (c) 2006 CACE Technologies, Davis (California)
  * All rights reserved.
  *
@@ -458,8 +458,6 @@ dissect_80211_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
     guint16 common_frequency;
     gchar *chan_str;
 
-    if (!tree)
-        return;
     ti = proto_tree_add_text(tree, tvb, offset, data_len, "802.11-Common");
     ftree = proto_item_add_subtree(ti, ett_dot11_common);
     add_ppi_field_header(tvb, ftree, &offset);
@@ -546,9 +544,6 @@ dissect_80211n_mac(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int
     *n_mac_flags = tvb_get_letohl(tvb, offset + subtree_off);
     *ampdu_id = tvb_get_letohl(tvb, offset + 4 + subtree_off);
 
-    if (!tree)
-        return;
-
     if (add_subtree) {
         ti = proto_tree_add_text(tree, tvb, offset, data_len, "802.11n MAC");
         ftree = proto_item_add_subtree(ti, ett_dot11n_mac);
@@ -592,9 +587,6 @@ static void dissect_80211n_mac_phy(tvbuff_t *tvb, packet_info *pinfo, proto_tree
     guint16 ext_frequency;
     gchar *chan_str;
 
-    if (!tree)
-        return;
-
     ti = proto_tree_add_text(tree, tvb, offset, data_len, "802.11n MAC+PHY");
     ftree = proto_item_add_subtree(ti, ett_dot11n_mac_phy);
     add_ppi_field_header(tvb, ftree, &offset);
@@ -666,9 +658,6 @@ static void dissect_aggregation_extension(tvbuff_t *tvb, packet_info *pinfo _U_,
     proto_item *ti = NULL;
     ptvcursor_t *csr = NULL;
 
-    if (!tree)
-        return;
-
     ti = proto_tree_add_text(tree, tvb, offset, data_len, "Aggregation Extension");
     ftree = proto_item_add_subtree(ti, ett_aggregation_extension);
     add_ppi_field_header(tvb, ftree, &offset);
@@ -691,9 +680,6 @@ static void dissect_8023_extension(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
     proto_item *ti = NULL;
     ptvcursor_t *csr = NULL;
 
-    if (!tree)
-        return;
-
     ti = proto_tree_add_text(tree, tvb, offset, data_len, "802.3 Extension");
     ftree = proto_item_add_subtree(ti, ett_8023_extension);
     add_ppi_field_header(tvb, ftree, &offset);