mp4 box type is always a 7bit ascii string
authormartink <martink@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 21 Jan 2014 22:16:05 +0000 (22:16 +0000)
committermartink <martink@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 21 Jan 2014 22:16:05 +0000 (22:16 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54881 f5534014-38df-0310-8fa8-9805f1628bb7

epan/dissectors/file-mp4.c

index 5dbe636c4cb9bfeec8ec4f43dadb70bf9fce0043..14cbff8482aae6eea904e2d94fbff7d8c33f087d 100644 (file)
@@ -220,7 +220,8 @@ dissect_mp4_box(guint32 parent_box_type _U_,
         return -1;
 
     box_type = tvb_get_ntohl(tvb, offset+4);
-    box_type_str = tvb_get_string(wmem_packet_scope(), tvb, offset+4, 4);
+    box_type_str = tvb_get_string_enc(wmem_packet_scope(), tvb,
+            offset+4, 4, ENC_ASCII|ENC_NA);
 
     type_pi = proto_tree_add_text(tree, tvb, offset, -1, "%s (%s)",
             val_to_str_const(box_type, box_types, "unknown"), box_type_str);