diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-08-02 22:05:36 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-08-02 22:05:36 +0000 |
| commit | 09bfd96c5f6d9a8abd6e72bed44ed30cc2dda359 (patch) | |
| tree | b39a12f99d032cd445042d00606805f599c86121 /epan/dissectors/packet-ieee802154.c | |
| parent | 1c0960e4a92301a36240a0549fba7a038ada789c (diff) | |
Switch back to seasonal memory for the address UAT data since r50073
indicates that that's the correct thing to do for now.
svn path=/trunk/; revision=51127
Diffstat (limited to 'epan/dissectors/packet-ieee802154.c')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index de6e04f71b..fc03799e25 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -2236,7 +2236,7 @@ ieee802154_map_rec *ieee802154_addr_update(ieee802154_map_tab_t *au_ieee802154_m } /* create a new mapping record */ - p_map_rec = wmem_new(wmem_epan_scope(), ieee802154_map_rec); + p_map_rec = se_new(ieee802154_map_rec); p_map_rec->proto = proto; p_map_rec->start_fnum = fnum; p_map_rec->end_fnum = 0; @@ -2248,7 +2248,7 @@ ieee802154_map_rec *ieee802154_addr_update(ieee802154_map_tab_t *au_ieee802154_m g_hash_table_insert(au_ieee802154_map->short_table, &old_key, p_map_rec); } else { /* create new hash entry */ - g_hash_table_insert(au_ieee802154_map->short_table, wmem_memdup(wmem_epan_scope(), &addr16, sizeof(addr16)), p_map_rec); + g_hash_table_insert(au_ieee802154_map->short_table, se_memdup(&addr16, sizeof(addr16)), p_map_rec); } if ( g_hash_table_lookup_extended(au_ieee802154_map->long_table, &long_addr, &old_key, NULL) ) { @@ -2256,7 +2256,7 @@ ieee802154_map_rec *ieee802154_addr_update(ieee802154_map_tab_t *au_ieee802154_m g_hash_table_insert(au_ieee802154_map->long_table, &old_key, p_map_rec); } else { /* create new hash entry */ - g_hash_table_insert(au_ieee802154_map->long_table, wmem_memdup(wmem_epan_scope(), &long_addr, sizeof(long_addr)), p_map_rec); + g_hash_table_insert(au_ieee802154_map->long_table, se_memdup(&long_addr, sizeof(long_addr)), p_map_rec); } return p_map_rec; |