diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-14 10:53:29 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-14 10:53:29 +0000 |
| commit | 074349264e4d3e139ed2622645bdef231b63ede3 (patch) | |
| tree | 68da320329816427291c39c58253c4ebd9c5736d /epan/dissectors/packet-dcp-etsi.c | |
| parent | f9faa339a57cbd3837dbad3de72a0c0e18fbd809 (diff) | |
Convert some dissectors to wmem (leaving uat-like memory with emem for now)
svn path=/trunk/; revision=52031
Diffstat (limited to 'epan/dissectors/packet-dcp-etsi.c')
| -rw-r--r-- | epan/dissectors/packet-dcp-etsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index 0d75b1dff0..e4b9d5ab56 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -32,7 +32,7 @@ #include <epan/reassemble.h> #include <wsutil/crcdrm.h> #include <epan/reedsolomon.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #include <string.h> /* forward reference */ @@ -288,7 +288,7 @@ dissect_pft_fec_detailed(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, proto_tree_add_text (tree, tvb, 0, -1, "want %d, got %d need %d", fcount, fragments, rx_min ); - got = (guint32 *)ep_alloc(fcount*sizeof(guint32)); + got = (guint32 *)wmem_alloc(wmem_packet_scope(), fcount*sizeof(guint32)); /* make a list of the findex (offset) numbers of the fragments we have */ fd = fragment_get(&dcp_reassembly_table, pinfo, seq, NULL); @@ -301,7 +301,7 @@ dissect_pft_fec_detailed(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, if(fragments>=rx_min) { /* yes, in theory */ guint i,current_findex; fragment_head *frag=NULL; - guint8 *dummy_data = (guint8*) ep_alloc0 (plen); + guint8 *dummy_data = (guint8*) wmem_alloc0 (wmem_packet_scope(), plen); tvbuff_t *dummytvb = tvb_new_real_data(dummy_data, plen, plen); /* try and decode with missing fragments */ if(tree) |