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

diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index c50fdade31309784cfc8a868f021ba5eee894ae8..1301ba4f8bfb097308b0b0d4679e3b47c3d5e3eb 100644 (file)
--- 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;
 }