osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity

Save and restore private_data pointer instead of freeing the old one, since this

Browse source 
function can be called nestedly. Also use wmem memory so it doesn't leak.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8828

svn path=/trunk/; revision=50094
This commit is contained in:
Evan Huus 2013-06-20 23:27:16 +00:00
parent 3307acc35f
commit 3258f1297e
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
epan/dissectors/packet-dcom-sysact.c
View file

@ -28,6 +28,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/wmem/wmem.h>
#include "packet-dcerpc.h"
#include "packet-dcom.h"
@ -394,6 +395,7 @@ dissect_dcom_ActivationProperties(tvbuff_t *tvb, gint offset, packet_info *pinfo
dcerpc_info *di;
proto_item *sub_item;
proto_tree *sub_tree;
property_guids_t *old_pg = NULL;
guint32 u32TotalSize;
guint32 u32Res;
@ -407,16 +409,13 @@ dissect_dcom_ActivationProperties(tvbuff_t *tvb, gint offset, packet_info *pinfo
hf_sysact_res, &u32Res);
di = (dcerpc_info *)pinfo->private_data;
if (di->private_data) {
g_free(di->private_data);
}
di->private_data = g_new(property_guids_t,1);
memset(di->private_data, 0, sizeof(property_guids_t));
old_pg = (property_guids_t*)di->private_data;
di->private_data = wmem_new0(wmem_packet_scope(), property_guids_t);
offset = dissect_dcom_ActivationPropertiesCustomerHdr(tvb, offset, pinfo, sub_tree, drep);
offset = dissect_dcom_ActivationPropertiesBody(tvb, offset, pinfo, sub_tree, drep);
g_free(di->private_data);
di->private_data = old_pg;
return offset;
}