As suggested by Didier in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3055 :

Apply rev 25869 to some more dissectors.

svn path=/trunk/; revision=36333

1 files changed, 7 insertions, 7 deletions

diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c
index 8b761fc7c0..392c3a3a93 100644
--- a/epan/dissectors/packet-ldp.c
+++ b/epan/dissectors/packet-ldp.c
@@ -2922,13 +2922,14 @@ dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
              */
             if (length_remaining < 4) {
                 /*
-                 * 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.
+                 * Yes.  Tell the TCP dissector where the data for this message
+                 * 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 = 4 - length_remaining;
+                pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
                 return -((gint32) pinfo->desegment_len);
             }
         }
@@ -2955,8 +2956,7 @@ dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                  * need, and return.
                  */
                 pinfo->desegment_offset = offset;
-                pinfo->desegment_len =
-                    (plen + 4) - length_remaining;
+                pinfo->desegment_len = (plen + 4) - length_remaining;
                 return -((gint32) pinfo->desegment_len);
             }
         }