diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-04-21 19:12:26 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-04-22 04:32:32 +0000 |
| commit | 9abbf8b69d830bff29705991d6ebb760ec2f4454 (patch) | |
| tree | 7a75eda3bf85ae8846511215c4c0ef0a42ca1940 /epan/dissectors/packet-lbmc.c | |
| parent | 9de18e88f501ef953395b8cadf9dbc9b79ce40cc (diff) | |
Do not mix wmem and glib allocators
Change-Id: I0e845668a1b9dbec93ea920a8585ecfe60f001d1
Reviewed-on: https://code.wireshark.org/review/15044
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-lbmc.c')
| -rw-r--r-- | epan/dissectors/packet-lbmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index d3b303a777..b6db8ac1b2 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -9967,7 +9967,7 @@ static int dissect_nhdr_extopt(tvbuff_t * tvb, int offset, packet_info * pinfo, { tvb_memcpy(tvb, reassembly->data + fragment_offset, data_offset, data_len); reassembly->len += data_len; - buf = (gchar *) wmem_memdup(wmem_file_scope(), reassembly->data, reassembly->len); + buf = (gchar *) wmem_memdup(pinfo->pool, reassembly->data, reassembly->len); reassembly_tvb = tvb_new_real_data(buf, reassembly->len, reassembly->len); add_new_data_source(pinfo, reassembly_tvb, "Reassembled EXTOPT fragment data"); } @@ -11367,7 +11367,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr gchar * buf = NULL; /* Create a new real data tvb of the reassembled data. */ - buf = (gchar *)wmem_alloc(wmem_file_scope(), (size_t)msg->total_len); + buf = (gchar *)wmem_alloc(pinfo->pool, (size_t)msg->total_len); cur = msg->entry; while (cur != NULL) { |