From Martin Warnesi:

Much simplified patch to use column fences on the COL_INFO field to
prevent sebsequent calls to the SSL dissector for the same packet
clearing the information placed by earlier calls. After each SSL record
is processed a col_set_fence() call is now issued to preserve what has
been written.

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

diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 0ecd611ee6ccc2d324bd397181775b935766a122..601c098e190e84b0e95e1055895d4092cbaa5c60 100644 (file)
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -742,6 +742,8 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         /* set up for next record in frame, if any */
         first_record_in_frame = FALSE;
     }
+    if (check_col(pinfo->cinfo, COL_INFO)) 
+       col_set_fence(pinfo->cinfo, COL_INFO);
     tap_queue_packet(ssl_tap, pinfo, (gpointer)proto_ssl);
 }