aboutsummaryrefslogtreecommitdiffstats
path: root/epan/tvbuff.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2020-11-18 10:52:46 +0100
committerAnders Broman <anders.broman@ericsson.com>2020-11-18 10:54:57 +0100
commitff3f9d3e4a8c70bcffd773a988d7ccc212c8e0a4 (patch)
tree5ac771a85bd4d21748da3101596bec65264833e6 /epan/tvbuff.c
parent7906a2f6a8de717e9713e7cc38e1c725b2acd695 (diff)
tvb_get_bcd_string: 0xf can both be filler and stop digit.
Diffstat (limited to 'epan/tvbuff.c')
-rw-r--r--epan/tvbuff.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c
index df44f60955..6efe933ae2 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -4178,11 +4178,9 @@ tvb_get_bcd_string(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, gi
*/
octet = octet >> 4;
- if (len == 1 && octet == 0x0f) {
+ if (octet == 0x0f) {
/*
- * This is the last octet, and the high-order
- * nibble is 0xf, so we have an odd number of
- * digits, and this is a filler digit. Ignore
+ * This is the stop digit or a filler digit. Ignore
* it.
*/
break;