From Andrew Jean:

When dissecting an eDonkey "Request Parts" message, Wireshark incorrectly reads
3 offset start/end pairs when the actual number can be 1-3 pairs.

svn path=/trunk/; revision=31071

1 files changed, 14 insertions, 7 deletions

diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index 87aa2ef7b7..8b79983927 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -1881,13 +1881,20 @@ static void dissect_edonkey_tcp_message(guint8 msg_type,
             break;
 
         case EDONKEY_MSG_REQUEST_PARTS:  /* Request Parts: <File hash> <Start offset>(3) <End offset>(3) */
-            offset = dissect_edonkey_file_hash(tvb, pinfo, offset, tree);
-            offset = dissect_edonkey_start_offset(tvb, pinfo, offset, tree);
-            offset = dissect_edonkey_start_offset(tvb, pinfo, offset, tree);
-            offset = dissect_edonkey_start_offset(tvb, pinfo, offset, tree);
-            offset = dissect_edonkey_end_offset(tvb, pinfo, offset, tree);
-            offset = dissect_edonkey_end_offset(tvb, pinfo, offset, tree);
-            offset = dissect_edonkey_end_offset(tvb, pinfo, offset, tree);
+            {
+              int pairs, count;
+              offset = dissect_edonkey_file_hash(tvb, pinfo, offset, tree);
+              pairs = (msg_end - offset) / 8;
+
+              for (count=0; count < pairs; count++)
+              {
+                offset = dissect_edonkey_start_offset(tvb, pinfo, offset, tree);
+              }
+              for (count=0; count < pairs; count++)
+              {
+                offset = dissect_edonkey_end_offset(tvb, pinfo, offset, tree);
+              }
+            }
             break;
 
         case EDONKEY_MSG_SENDING_PART:  /* Sending Part: <File hash> <Start offset> <End offset> DATA */