diff options
author | Jörg Mayer <jmayer@loplof.de> | 2013-09-13 10:13:19 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2013-09-13 10:13:19 +0000 |
commit | 23d3e3d665ce2826477bf04ceabe961330cfcd5a (patch) | |
tree | 5ba7e0d34e5a234c811a34fdd9e4ba2b52dd1848 /epan/dissectors/packet-dplay.c | |
parent | 1e762e315dcb07f8d78d7aabc20f5065a8ed43f0 (diff) |
Dario Lombardo <lomato@gmail.com> via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147
Migration from emem to wmem for trivial cases (ep_alloc only).
svn path=/trunk/; revision=52002
Diffstat (limited to 'epan/dissectors/packet-dplay.c')
-rw-r--r-- | epan/dissectors/packet-dplay.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 9d43cc3bb1..f43ab28081 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -28,7 +28,7 @@ #include "config.h" #include <epan/packet.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #include <epan/aftypes.h> #include <string.h> @@ -428,7 +428,7 @@ static gint display_unicode_string(proto_tree *tree, gint hf_index, tvbuff_t *tv * Allocate a buffer for the string; "len" is the length in * bytes, not the length in characters. */ - str = (char *)ep_alloc(len/2); + str = (char *)wmem_alloc(wmem_packet_scope(), len/2); /* * XXX - this assumes the string is just ISO 8859-1; we need @@ -1745,4 +1745,3 @@ void proto_reg_handoff_dplay(void) heur_dissector_add("udp", heur_dissect_dplay, proto_dplay); heur_dissector_add("tcp", heur_dissect_dplay, proto_dplay); } - |