From Didier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3055 :

Apply rev 25869 to most of the rest of the TCP-desegmenting dissectors.
(The SSL dissector was already updated in one of two spots with bug 4535/rev
32456.)

A couple of the patches had to be manually applied.

From me: Fix the comments to match the change (including in the TCP and SSL
dissectors.)


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

1 files changed, 4 insertions, 2 deletions

diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index bd8dba4f15..4ce527e5d3 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -2070,8 +2070,10 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
             if (length_remaining < fixed_len) {
                 /*
                  * Yes.  Tell the TCP dissector where the data for this message
-                 * starts in the data it handed us, and how many more bytes we
-                 * need, and return.
+                 * starts in the data it handed us and that we need "some more
+                 * data."  Don't tell it exactly how many bytes we need because
+                 * if/when we ask for even more (after the header) that will
+                 * break reassembly.
                  */
                 pinfo->desegment_offset = offset;
                 pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;