git.samba.org
/
metze
/
wireshark
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ddb966f
)
mp4 box type is always a 7bit ascii string
author
Martin Kaiser
<wireshark@kaiser.cx>
Tue, 21 Jan 2014 22:16:05 +0000
(22:16 -0000)
committer
Martin Kaiser
<wireshark@kaiser.cx>
Tue, 21 Jan 2014 22:16:05 +0000
(22:16 -0000)
svn path=/trunk/; revision=54881
epan/dissectors/file-mp4.c
patch
|
blob
|
history
diff --git
a/epan/dissectors/file-mp4.c
b/epan/dissectors/file-mp4.c
index 5dbe636c4cb9bfeec8ec4f43dadb70bf9fce0043..14cbff8482aae6eea904e2d94fbff7d8c33f087d 100644
(file)
--- 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);