diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-07-20 23:54:35 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-07-22 06:21:54 +0000 |
| commit | 53de2c23783788d92dc17d3dccfdc8b65ab0bf74 (patch) | |
| tree | 2395270e27575e7261eda4bc9118daed12b69f90 /epan/dissectors/packet-spnego.c | |
| parent | b2e4a7e21ce7ee8fee857ee71d51ad1ec13feb2e (diff) | |
| download | wireshark-53de2c23783788d92dc17d3dccfdc8b65ab0bf74.tar.gz | |
Convert more glib memory to wmem pinfo pool
Change-Id: I4cc23bc19a6bd8c6a8e0389eaf939dbb60fe0ca3
Reviewed-on: https://code.wireshark.org/review/16562
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-spnego.c')
| -rw-r--r-- | epan/dissectors/packet-spnego.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index e988bb7ee8..e13b4dbad2 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1168,15 +1168,13 @@ decrypt_gssapi_krb_cfx_wrap(proto_tree *tree, if (output) { guint8 *outdata; - outdata = (guint8 *)g_memdup(output, tvb_captured_length(gssapi_encrypt->gssapi_encrypted_tvb)); - g_free(output); + outdata = (guint8 *)wmem_memdup(pinfo->pool, output, tvb_captured_length(gssapi_encrypt->gssapi_encrypted_tvb)); gssapi_encrypt->gssapi_decrypted_tvb=tvb_new_child_real_data(gssapi_encrypt->gssapi_encrypted_tvb, outdata, tvb_captured_length(gssapi_encrypt->gssapi_encrypted_tvb), tvb_captured_length(gssapi_encrypt->gssapi_encrypted_tvb)); add_new_data_source(pinfo, gssapi_encrypt->gssapi_decrypted_tvb, "Decrypted GSS-Krb5"); - tvb_set_free_cb(gssapi_encrypt->gssapi_decrypted_tvb, g_free); } } @@ -1966,7 +1964,7 @@ void proto_register_spnego(void) { NULL, HFILL }}, /*--- End of included file: packet-spnego-hfarr.c ---*/ -#line 1421 "./asn1/spnego/packet-spnego-template.c" +#line 1419 "./asn1/spnego/packet-spnego-template.c" }; /* List of subtrees */ @@ -1989,7 +1987,7 @@ void proto_register_spnego(void) { &ett_spnego_InitialContextToken_U, /*--- End of included file: packet-spnego-ettarr.c ---*/ -#line 1431 "./asn1/spnego/packet-spnego-template.c" +#line 1429 "./asn1/spnego/packet-spnego-template.c" }; static ei_register_info ei[] = { |