diff options
| author | Evan Huus <eapache@gmail.com> | 2013-06-20 06:26:03 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-06-20 06:26:03 +0000 |
| commit | d63bd5330ffa0a57bf1dfda6ad636abc43814cee (patch) | |
| tree | 7de5b2c91ef587711041da946024b044a4cb145d /epan/dissectors/packet-pres.c | |
| parent | 4c506222d92a01bf6cb2481993577d979c4cc25c (diff) | |
| download | wireshark-d63bd5330ffa0a57bf1dfda6ad636abc43814cee.tar.gz | |
Back out some of the wmem conversions (r50063 and r50057).
These dissectors allocate ephemeral or seasonal memory in UAT callbacks, which
really makes no sense because UAT callbacks can occur when there is no packet or
file in scope, making this effectively a leak if the user is fiddling with their
UAT and never opens a capture.
Emem let you get away with this, wmem forces an assertion. Back out the changes
so that the UATs are usable until the code can be properly fixed to not use
out-of-scope allocators.
svn path=/trunk/; revision=50073
Diffstat (limited to 'epan/dissectors/packet-pres.c')
| -rw-r--r-- | epan/dissectors/packet-pres.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 530bee1807..75f6ce611b 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -38,7 +38,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> +#include <epan/emem.h> #include <epan/expert.h> #include <epan/uat.h> @@ -273,9 +273,9 @@ register_ctx_id_and_oid(packet_info *pinfo _U_, guint32 idx, const char *oid) return; } - pco=wmem_new(wmem_file_scope(), pres_ctx_oid_t); + pco=se_new(pres_ctx_oid_t); pco->ctx_id=idx; - pco->oid=wmem_strdup(wmem_file_scope(), oid); + pco->oid=se_strdup(oid); conversation=find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation) { |