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-smb2.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-smb2.c')
| -rw-r--r-- | epan/dissectors/packet-smb2.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index a2dbc2a1bb..7e2f48b9f3 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -7710,11 +7710,11 @@ dissect_smb2_transform_header(packet_info *pinfo _U_, proto_tree *tree, memcpy(&A_1[1], sti->nonce, 15 - 4); - plain_data = (guint8 *)tvb_memdup(NULL, tvb, offset, sti->size); + plain_data = (guint8 *)tvb_memdup(pinfo->pool, tvb, offset, sti->size); /* Open the cipher. */ if (gcry_cipher_open(&cipher_hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CTR, 0)) { - g_free(plain_data); + wmem_free(pinfo->pool, plain_data); plain_data = NULL; goto done_decryption; } @@ -7722,20 +7722,20 @@ dissect_smb2_transform_header(packet_info *pinfo _U_, proto_tree *tree, /* Set the key and initial value. */ if (gcry_cipher_setkey(cipher_hd, decryption_key, 16)) { gcry_cipher_close(cipher_hd); - g_free(plain_data); + wmem_free(pinfo->pool, plain_data); plain_data = NULL; goto done_decryption; } if (gcry_cipher_setctr(cipher_hd, A_1, 16)) { gcry_cipher_close(cipher_hd); - g_free(plain_data); + wmem_free(pinfo->pool, plain_data); plain_data = NULL; goto done_decryption; } if (gcry_cipher_encrypt(cipher_hd, plain_data, sti->size, NULL, 0)) { gcry_cipher_close(cipher_hd); - g_free(plain_data); + wmem_free(pinfo->pool, plain_data); plain_data = NULL; goto done_decryption; } @@ -7749,7 +7749,6 @@ done_decryption: if (plain_data != NULL) { *plain_tvb = tvb_new_child_real_data(*enc_tvb, plain_data, sti->size, sti->size); - tvb_set_free_cb(*plain_tvb, g_free); add_new_data_source(pinfo, *plain_tvb, "Decrypted SMB3"); } |