diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-15 21:36:37 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-15 21:36:37 +0000 |
| commit | da8240ef608746f9f47526c315c0dca8fcc0ab15 (patch) | |
| tree | 874489efe62bd5f22680aadd4df3ad834421975e /epan/dissectors/packet-zbee-aps.c | |
| parent | da27bad13bfddec18c18a8e95a994b7c676a6f05 (diff) | |
emem -> wmem (except uat or init routines)
svn path=/trunk/; revision=52087
Diffstat (limited to 'epan/dissectors/packet-zbee-aps.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-aps.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index dea1f1e402..e31418a458 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -32,7 +32,7 @@ #include <epan/packet.h> #include <epan/prefs.h> /* req'd for packet-zbee-security.h */ #include <epan/expert.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #include <epan/reassemble.h> #include "packet-zbee.h" @@ -1235,7 +1235,8 @@ dissect_zbee_aps_transport_key(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree key_record.frame_num = pinfo->fd->num; key_record.label = NULL; memcpy(&key_record.key, &key, ZBEE_APS_CMD_KEY_LENGTH); - *nwk_keyring = g_slist_prepend(*nwk_keyring, se_memdup(&key_record, sizeof(key_record_t))); + *nwk_keyring = g_slist_prepend(*nwk_keyring, wmem_memdup(wmem_file_scope(), + &key_record, sizeof(key_record_t))); } } } |