diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-08 12:13:18 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-09 06:02:59 +0000 |
| commit | 6a6e2efbf937c3533304c0814b0bff269932219e (patch) | |
| tree | 065ecbf7a961ecd9588db97b70a7f11e119048dc /epan/addr_resolv.c | |
| parent | 456095c89dd5fe257ce86d5529179295ebf9151e (diff) | |
| download | wireshark-6a6e2efbf937c3533304c0814b0bff269932219e.tar.gz | |
Have ipxnet addresses use wmem scoped memory.
Change-Id: I1d8eed2ceacccce2768590f0689cd2c83a5e56e9
Reviewed-on: https://code.wireshark.org/review/6418
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 7221ee34b2..2d3756f340 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -1864,7 +1864,7 @@ add_ipxnet_name(guint addr, const gchar *name) #endif static gchar * -ipxnet_name_lookup(const guint addr) +ipxnet_name_lookup(wmem_allocator_t *allocator, const guint addr) { hashipxnet_t *tp; ipxnet_t *ipxnet; @@ -1878,7 +1878,7 @@ ipxnet_name_lookup(const guint addr) tp = g_new(hashipxnet_t, 1); g_hash_table_insert(ipxnet_hash_table, key, tp); }else{ - return tp->name; + return wmem_strdup(allocator, tp->name); } /* fill in a new entry */ @@ -1893,7 +1893,7 @@ ipxnet_name_lookup(const guint addr) g_strlcpy(tp->name, ipxnet->name, MAXNAMELEN); } - return (tp->name); + return wmem_strdup(allocator, tp->name); } /* ipxnet_name_lookup */ @@ -3001,14 +3001,14 @@ add_ether_byip(const guint ip, const guint8 *eth) } /* add_ether_byip */ const gchar * -get_ipxnet_name(const guint32 addr) +get_ipxnet_name(wmem_allocator_t *allocator, const guint32 addr) { if (!gbl_resolv_flags.network_name) { - return ipxnet_to_str_punct(addr, '\0'); + return ipxnet_to_str_punct(allocator, addr, '\0'); } - return ipxnet_name_lookup(addr); + return ipxnet_name_lookup(allocator, addr); } /* get_ipxnet_name */ |