diff options
| author | Evan Huus <eapache@gmail.com> | 2012-12-18 03:15:23 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2012-12-18 03:15:23 +0000 |
| commit | 7577443c0fc1e0589cd687ec24ceb83ce115e5e3 (patch) | |
| tree | ce4c12501d75cb2cf1e709bf7333f6e8608c41b9 /epan | |
| parent | c858bd1452e5b622cefa8944f9e679664c8376fd (diff) | |
Use pinfo-scoped memory for 6LoWPAN addresses.
Fixes at least part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7885
svn path=/trunk/; revision=46582
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-6lowpan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index ca75ef3ada..00e3fef188 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -52,6 +52,7 @@ #include <epan/reassemble.h> #include <epan/ipproto.h> #include <epan/in_cksum.h> +#include <epan/wmem/wmem.h> #include "packet-ipv6.h" #include "packet-ieee802154.h" #include "packet-6lowpan.h" @@ -2184,7 +2185,7 @@ dissect_6lowpan_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_uint(mesh_tree, hf_6lowpan_mesh_orig16, tvb, offset, sizeof(guint16), addr16); } - ifcid = (guint8 *)ep_alloc(sizeof(guint64)); + ifcid = (guint8 *)wmem_alloc(pinfo->pool, sizeof(guint64)); lowpan_addr16_to_ifcid(addr16, ifcid); src_ifcid = ifcid; offset += sizeof(guint16); @@ -2207,7 +2208,7 @@ dissect_6lowpan_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_uint(mesh_tree, hf_6lowpan_mesh_dest16, tvb, offset, sizeof(guint16), addr16); } - ifcid = (guint8 *)ep_alloc(sizeof(guint64)); + ifcid = (guint8 *)wmem_alloc(pinfo->pool, sizeof(guint64)); lowpan_addr16_to_ifcid(addr16, ifcid); dst_ifcid = ifcid; offset += sizeof(guint16); |