aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ncp-nmas.c
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2013-09-13 10:13:19 +0000
committerJörg Mayer <jmayer@loplof.de>2013-09-13 10:13:19 +0000
commit23d3e3d665ce2826477bf04ceabe961330cfcd5a (patch)
tree5ba7e0d34e5a234c811a34fdd9e4ba2b52dd1848 /epan/dissectors/packet-ncp-nmas.c
parent1e762e315dcb07f8d78d7aabc20f5065a8ed43f0 (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-ncp-nmas.c')
-rw-r--r--epan/dissectors/packet-ncp-nmas.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c
index 885a2fb56a..c5e549028d 100644
--- a/epan/dissectors/packet-ncp-nmas.c
+++ b/epan/dissectors/packet-ncp-nmas.c
@@ -28,7 +28,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
#include "packet-ncp-int.h"
#include "packet-ncp-nmas.h"
@@ -206,7 +206,7 @@ nmas_string(tvbuff_t* tvb, int hfinfo, proto_tree *nmas_tree, int offset, gboole
guint16 c_char;
guint32 length_remaining = 0;
- buffer = (char *)ep_alloc(ITEM_LABEL_LENGTH+1);
+ buffer = (char *)wmem_alloc(wmem_packet_scope(), ITEM_LABEL_LENGTH+1);
if (little) {
str_length = tvb_get_letohl(tvb, foffset);
} else {
@@ -773,4 +773,3 @@ proto_register_nmas(void)
* vi: set shiftwidth=4 tabstop=4 expandtab:
* :indentSize=4:tabSize=4:noTabs=true:
*/
-