From 89487a002335e6912e80ecc1f9eae3cab0ddb8ec Mon Sep 17 00:00:00 2001
From: jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Fri, 5 Feb 2010 22:08:29 +0000
Subject: Harden "Process Information" presentation functions.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31806 f5534014-38df-0310-8fa8-9805f1628bb7
---
 epan/dissectors/packet-tcp.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'epan/dissectors/packet-tcp.c')

diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index ccd04968d7..04d2709bc3 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -3544,11 +3544,11 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
   }
 
-  if (tcpd && (tcpd->fwd || tcpd->rev) && (tcpd->fwd->command || tcpd->rev->command)) {
+  if (tcpd && ((tcpd->fwd && tcpd->fwd->command) || (tcpd->rev && tcpd->rev->command))) {
     ti = proto_tree_add_text(tcp_tree, tvb, offset, 0, "Process Information");
-	PROTO_ITEM_SET_GENERATED(ti);
+    PROTO_ITEM_SET_GENERATED(ti);
     field_tree = proto_item_add_subtree(ti, ett_tcp_process_info);
-	if (tcpd->fwd->command) {
+    if (tcpd->fwd && tcpd->fwd->command) {
       proto_tree_add_uint_format_value(field_tree, hf_tcp_proc_dst_uid, tvb, 0, 0,
               tcpd->fwd->process_uid, "%u", tcpd->fwd->process_uid);
       proto_tree_add_uint_format_value(field_tree, hf_tcp_proc_dst_pid, tvb, 0, 0,
@@ -3557,8 +3557,8 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
               tcpd->fwd->username, "%s", tcpd->fwd->username);
       proto_tree_add_string_format_value(field_tree, hf_tcp_proc_dst_cmd, tvb, 0, 0,
               tcpd->fwd->command, "%s", tcpd->fwd->command);
-	}
-	if (tcpd->rev->command) {
+    }
+    if (tcpd->rev && tcpd->rev->command) {
       proto_tree_add_uint_format_value(field_tree, hf_tcp_proc_src_uid, tvb, 0, 0,
               tcpd->rev->process_uid, "%u", tcpd->rev->process_uid);
       proto_tree_add_uint_format_value(field_tree, hf_tcp_proc_src_pid, tvb, 0, 0,
@@ -3567,7 +3567,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
               tcpd->rev->username, "%s", tcpd->rev->username);
       proto_tree_add_string_format_value(field_tree, hf_tcp_proc_src_cmd, tvb, 0, 0,
               tcpd->rev->command, "%s", tcpd->rev->command);
-	}
+    }
   }
 
   /*
-- 
cgit v1.2.3