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 /epan/dissectors/pidl | |
parent | 11ef8a5e0f0acf7134edf8c0b4bb1d7239994d11 (diff) |
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 'epan/dissectors/pidl')
-rw-r--r-- | epan/dissectors/pidl/mapi/request.cnf.c | 3 | ||||
-rw-r--r-- | epan/dissectors/pidl/mapi/response.cnf.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/pidl/mapi/request.cnf.c b/epan/dissectors/pidl/mapi/request.cnf.c index 911a80d0d9..4db47ebf38 100644 --- a/epan/dissectors/pidl/mapi/request.cnf.c +++ b/epan/dissectors/pidl/mapi/request.cnf.c @@ -136,10 +136,9 @@ mapi_dissect_element_EcDoRpc_request_(tvbuff_t *tvb _U_, int offset _U_, packet_ decrypted_data[i] = ptr[i] ^ 0xA5; } - decrypted_tvb = tvb_new_real_data(decrypted_data, size, reported_len); + decrypted_tvb = tvb_new_child_real_data(tvb, decrypted_data, size, reported_len); tvb_set_free_cb(decrypted_tvb, g_free); - tvb_set_child_real_data_tvbuff(tvb, decrypted_tvb); add_new_data_source(pinfo, decrypted_tvb, "Decrypted MAPI"); it = proto_tree_add_text(tree, decrypted_tvb, 0, size, "Decrypted MAPI PDU"); diff --git a/epan/dissectors/pidl/mapi/response.cnf.c b/epan/dissectors/pidl/mapi/response.cnf.c index 8b98669a2f..4f36592644 100644 --- a/epan/dissectors/pidl/mapi/response.cnf.c +++ b/epan/dissectors/pidl/mapi/response.cnf.c @@ -146,10 +146,8 @@ mapi_dissect_element_EcDoRpc_response_(tvbuff_t *tvb _U_, int offset _U_, packet decrypted_data[i] = ptr[i] ^ 0xA5; } - decrypted_tvb = tvb_new_real_data(decrypted_data, size, reported_len); + decrypted_tvb = tvb_new_child_real_data(tvb, decrypted_data, size, reported_len); tvb_set_free_cb(decrypted_tvb, g_free); - - tvb_set_child_real_data_tvbuff(tvb, decrypted_tvb); add_new_data_source(pinfo, decrypted_tvb, "Decrypted MAPI"); it = proto_tree_add_text(tree, decrypted_tvb, 0, size, "Decrypted MAPI PDU"); |