osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

DOF: restore correct memory scope for decrypted buffer 

Change-Id: I143f73f7921187bac5de46cd07344b015a06a578
Reviewed-on: https://code.wireshark.org/review/26420
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2018-03-11 07:36:49 +01:00
parent fc6b725b18
commit 4536696507
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-dof.c
View File

@ -7916,7 +7916,8 @@ static int dissect_ccm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
{
if (decrypt(session, pdata, nonce, epp_buf, a_len, buf, e_len))
{
guint8 *cache = (guint8 *)wmem_alloc0(pinfo->pool, e_len - session->mac_len);
/* store decrypted buffer in file scope for reuse in next pass */
guint8 *cache = (guint8 *)wmem_alloc0(wmem_file_scope(), e_len - session->mac_len);
memcpy(cache, buf, e_len - session->mac_len);
app = tvb_new_real_data(cache, e_len - session->mac_len, e_len - session->mac_len);
tvb_set_child_real_data_tvbuff(tvb, app);