make sure we actually get the tcpd structure pointer before we pass it as a parameter...

fixes bug 719

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

diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 60b02c435f9c8ed09708d3942dd8ebbf95664c90..f210bb0dc225a797b040c9af6c31e57dec239730 100644 (file)
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -2360,6 +2360,9 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   real_window = tcph->th_win;
   tcph->th_hlen = hi_nibble(th_off_x2) * 4;  /* TCP header length, in bytes */
 
+  /* find(or create if needed) the conversation for this tcp session */
+  tcpd=get_tcp_conversation_data(pinfo);
+
   /*
    * If we've been handed an IP fragment, we don't know how big the TCP
    * segment is, so don't do anything that requires that we know that.
@@ -2394,10 +2397,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
       }
 
-      /* find(or create if needed) the conversation for this tcp session */
-      tcpd=get_tcp_conversation_data(pinfo);
-
-
+ 
       /* handle TCP seq# analysis parse all new segments we see */
       if(tcp_analyze_seq){
           if(!(pinfo->fd->flags.visited)){