From ff3f9d3e4a8c70bcffd773a988d7ccc212c8e0a4 Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Wed, 18 Nov 2020 10:52:46 +0100
Subject: tvb_get_bcd_string: 0xf can both be filler and stop digit.

---
 epan/tvbuff.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'epan/tvbuff.c')

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;
-- 
cgit v1.2.3