aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2014-11-17 21:59:14 +0100
committerMichael Mann <mmann78@netscape.net>2014-11-17 21:16:24 +0000
commitda69b51c9e1c9e97860e8a48856acdd3ab381c07 (patch)
treefbbdc7ad148aec6374accb725e2ddd48f7b5becf
parent7a7a7639f22a14e8ea24d7870e29177265cec1f6 (diff)
DECT: ensure that bfield_data buffer is always fully initiated
Bug: 10710 Change-Id: I444bc4ff7e542a8aa5ac8e20bac44a823ac74cfd Reviewed-on: https://code.wireshark.org/review/5371 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-dect.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c
index f1c69f9c2c..0a61d5f90b 100644
--- a/epan/dissectors/packet-dect.c
+++ b/epan/dissectors/packet-dect.c
@@ -1279,7 +1279,11 @@ dissect_bfield(gboolean dect_packet_type _U_, guint8 ba,
bfield_length = DECT_BFIELD_DATA_SIZE;
if (bfield_length)
+ {
tvb_memcpy(tvb, bfield_data, offset, bfield_length);
+ if (bfield_length < DECT_BFIELD_DATA_SIZE)
+ memset(&bfield_data[bfield_length], 0, DECT_BFIELD_DATA_SIZE - bfield_length);
+ }
else
memset(bfield_data, 0, DECT_BFIELD_DATA_SIZE);