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/asn1/c1222 | |
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/asn1/c1222')
-rw-r--r-- | epan/dissectors/asn1/c1222/packet-c1222-template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/asn1/c1222/packet-c1222-template.c b/epan/dissectors/asn1/c1222/packet-c1222-template.c index 42f0ab8a40..c10244893e 100644 --- a/epan/dissectors/asn1/c1222/packet-c1222-template.c +++ b/epan/dissectors/asn1/c1222/packet-c1222-template.c @@ -950,7 +950,7 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_ encrypted = TRUE; #ifdef HAVE_LIBGCRYPT if (c1222_decrypt) { - buffer = (guchar *)tvb_memdup(wmem_packet_scope(), tvb, offset, len2); + buffer = (guchar *)tvb_memdup(pinfo->pool, tvb, offset, len2); if (!decrypt_packet(buffer, len2, TRUE)) { crypto_bad = TRUE; } else { |