aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-bthci_acl.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2012-12-02 17:01:04 +0000
committerEvan Huus <eapache@gmail.com>2012-12-02 17:01:04 +0000
commitb9c6f71fe48857a1d077b3ce064fad880396067e (patch)
tree4ea8b5592f4aaeea56d720deefb3d5960f94f8e8 /epan/dissectors/packet-bthci_acl.c
parent2461373edd7260ffc2c540dd9682f92fd05f5ebb (diff)
Create a wmem pool in pinfo and use it for some address allocations.
A (better?) fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8030 See also thread starting at: http://www.wireshark.org/lists/wireshark-dev/201212/msg00001.html svn path=/trunk/; revision=46331
Diffstat (limited to 'epan/dissectors/packet-bthci_acl.c')
-rw-r--r--epan/dissectors/packet-bthci_acl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c
index 9aec04aa3c..8e5a845acb 100644
--- a/epan/dissectors/packet-bthci_acl.c
+++ b/epan/dissectors/packet-bthci_acl.c
@@ -33,6 +33,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
+#include <epan/wmem/wmem.h>
#include "packet-bluetooth-hci.h"
#include "packet-bthci_acl.h"
@@ -187,7 +188,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
remote_ether_addr = get_ether_name(remote_bdaddr->bd_addr);
remote_length = (gint)(strlen(remote_ether_addr) + 3 + strlen(remote_name) + 1);
- remote_addr_name = se_alloc(remote_length);
+ remote_addr_name = wmem_alloc(pinfo->pool, remote_length);
g_snprintf(remote_addr_name, remote_length, "%s (%s)", remote_ether_addr, remote_name);
@@ -238,7 +239,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
localhost_name = "";
localhost_length = (gint)(strlen(localhost_ether_addr) + 3 + strlen(localhost_name) + 1);
- localhost_addr_name = se_alloc(localhost_length);
+ localhost_addr_name = wmem_alloc(pinfo->pool, localhost_length);
g_snprintf(localhost_addr_name, localhost_length, "%s (%s)", localhost_ether_addr, localhost_name);