From e599abd268715c05ad73b220f82fc8bd68eb7b59 Mon Sep 17 00:00:00 2001
From: pascal <pascal@localhost>
Date: Sun, 8 Apr 2012 13:10:45 +0000
Subject: [PATCH] Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7042
 : Handle properly filler and do not remove last digit

svn path=/trunk/; revision=41979
---
 epan/dissectors/packet-gtp.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index c50fdade31..1301ba4f8b 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -1931,10 +1931,14 @@ msisdn_to_str(tvbuff_t *tvb, gint offset, int len)
             j++;
         if (bits8to5 <= 9)
             str[j++] = BCD2CHAR(bits8to5);
+        else if ((i == (MIN(len, 9) - 1)) && (bits8to5 == 0xF)) {
+            /* filler found (odd number of digits); stop here */
+            break;
+        }
         else
             j++;
     }
-    str[j-1] = '\0';
+    str[j] = '\0';
 
     return str;
 }