aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Schlosser <christoph@schlosser.xyz>2017-07-25 08:11:45 +0200
committerRoland Knall <rknall@gmail.com>2017-07-25 08:40:44 +0000
commit7fadc161724cb5d3e1d3f8aa449c8078e5ffa9e1 (patch)
treea46df5463010e6801aad4a8e8b284550d4aab7f7
parentc6ed05ec73e1b1e22ea890fc95ec5e067726cbe8 (diff)
EPL: Add padding to size calculation for last frame
The padding was not part of the size calculation of the last subpayload in a multiple read/write by index. Change-Id: Ibbd3ded345352ea1ceaea7b871fc2d1a0e1a6832 Reviewed-on: https://code.wireshark.org/review/22781 Reviewed-by: Christoph Schlosser <christoph@schlosser.xyz> Reviewed-by: Roland Knall <rknall@gmail.com>
-rw-r--r--epan/dissectors/packet-epl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index 0d3734a4f6..865b4142ce 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -4296,7 +4296,7 @@ dissect_epl_sdo_command_write_multiple_by_index(struct epl_convo *convo, proto_t
if ( remlength < EPL_SOA_EPLV_OFFSET )
break;
- size = remlength - EPL_SOA_EPLV_OFFSET;
+ size = remlength - EPL_SOA_EPLV_OFFSET - padding;
lastentry = TRUE;
}
else
@@ -4638,7 +4638,7 @@ dissect_epl_sdo_command_read_multiple_by_index(struct epl_convo *convo, proto_tr
if ( remlength < EPL_SOA_EPLV_OFFSET )
break;
- size = remlength - EPL_SOA_EPLV_OFFSET;
+ size = remlength - EPL_SOA_EPLV_OFFSET - padding;
lastentry = TRUE;
}
else