aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/file-mp4.c
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2014-01-21 22:16:05 +0000
committerMartin Kaiser <wireshark@kaiser.cx>2014-01-21 22:16:05 +0000
commit5c825d6a364d83dace7b6c682aa47678e89df79b (patch)
treeeb17f3f2a9eb28ece8c206eb273d6e4464ba773f /epan/dissectors/file-mp4.c
parentddb966fb2fbe95c22948dab6e33d39647868d189 (diff)
mp4 box type is always a 7bit ascii string
svn path=/trunk/; revision=54881
Diffstat (limited to 'epan/dissectors/file-mp4.c')
-rw-r--r--epan/dissectors/file-mp4.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/file-mp4.c b/epan/dissectors/file-mp4.c
index 5dbe636c4c..14cbff8482 100644
--- a/epan/dissectors/file-mp4.c
+++ b/epan/dissectors/file-mp4.c
@@ -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);