diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-01-11 16:14:26 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-01-11 16:14:26 +0000 |
| commit | 324af9e6faea22dc42c13cf7efaeef7777550c2d (patch) | |
| tree | 987fbd224c57a79a89dd00ab3969dc74c2e10bb8 /asn1 | |
| parent | 11ef8a5e0f0acf7134edf8c0b4bb1d7239994d11 (diff) | |
| download | wireshark-324af9e6faea22dc42c13cf7efaeef7777550c2d.tar.gz wireshark-324af9e6faea22dc42c13cf7efaeef7777550c2d.tar.bz2 wireshark-324af9e6faea22dc42c13cf7efaeef7777550c2d.zip | |
Fix part of Bug 3917 "tvb_new_real_data is prone to memory leak"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3917
svn path=/trunk/; revision=31499
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index fa3c9392fd..e2a8bca2c9 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -359,7 +359,7 @@ int PBE_decrypt_data(const char *object_identifier_id _U_, tvbuff_t *encrypted_t /* OK - so now clear_data contains the decrypted data */ - clear_tvb = tvb_new_real_data((const guint8 *)clear_data, datalen, datalen); + clear_tvb = tvb_new_child_real_data(encrypted_tvb,(const guint8 *)clear_data, datalen, datalen); tvb_set_free_cb(clear_tvb, g_free); name = g_string_new(""); |