diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-09-12 22:44:08 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-09-12 22:44:08 +0000 |
| commit | 1810de72b6f6304b94894c3b44e8fced087b16d0 (patch) | |
| tree | 970a2efe61ffd0bf370ad5ac8a97ba0be515696b /epan/dissectors/packet-zbee-zdp.c | |
| parent | 2614ec5ea01b8f3504e2604ac57b0cc125d5e99f (diff) | |
In some cases add include emem.h
In other cases emem -> wmem
svn path=/trunk/; revision=51994
Diffstat (limited to 'epan/dissectors/packet-zbee-zdp.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zdp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index bca278d4c6..e3120e5ee0 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -30,6 +30,7 @@ #include <glib.h> #include <epan/packet.h> +#include <epan/wmem/wmem.h> #include <epan/expert.h> #include "packet-zbee.h" @@ -1014,8 +1015,8 @@ zdp_parse_complex_desc(proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *of proto_item *field_root; proto_tree *field_tree; - gchar *str = (gchar *)ep_alloc(length); - gchar *complex = (gchar *)ep_alloc(max_len); + gchar *str = (gchar *)wmem_alloc(wmem_packet_scope(), length); + gchar *complex = (gchar *)wmem_alloc(wmem_packet_scope(), max_len); guint8 tag; if ((tree) && (ettindex != -1)) { |