aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tftp.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2018-11-27 16:21:49 +0100
committerAnders Broman <a.broman58@gmail.com>2018-11-27 17:18:18 +0000
commit0f19cc4aff08ca04a6ddb96e5a26a8354352089a (patch)
treed2e72dc8b26b9263905cc0c38fab4b5ddaf9e16b /epan/dissectors/packet-tftp.c
parent164a9920e74c8cce150704d8bfcb2a7e4d47956d (diff)
TFTP: export object with correct tftp object data
Due to the lack of setting the size of the data objects, the exported objects file contains junk data. Set the actual size of the object data feed to the tap. Patch originally from Darius Davis <darius@vmware.com> Bug: 15304 Change-Id: I020a9f010e97f960e8a60b4c991acd0f678ec39c Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/30803 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-tftp.c')
-rw-r--r--epan/dissectors/packet-tftp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c
index 848e74aefe..e85b70ea08 100644
--- a/epan/dissectors/packet-tftp.c
+++ b/epan/dissectors/packet-tftp.c
@@ -517,6 +517,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info,
if (bytes > 0) {
/* Create a block for this block */
GByteArray *block = g_byte_array_sized_new(bytes);
+ block->len = bytes;
tvb_memcpy(data_tvb, block->data, 0, bytes);
/* Add to the end of the list (does involve traversing whole list..) */