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

packet-rrc: allocate correct type of object 

When creating a `flowd_p`, instead of allocating
space for a `gint`, allocate space for a `guint`,
which is the actual type of object used. Also,
switch from `g_malloc` to `g_new`.
This commit is contained in:
Moshe Kaplan 2020-12-26 21:54:52 -05:00 committed by AndersBroman
parent cd2d35c1d2
commit 969c1c0271
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/asn1/rrc/rrc.cnf
View File

@ -1377,7 +1377,7 @@ if(state_dec >= 0 && state_dec <= 3) {
/*If it doesn't exists, insert it*/
if( (cur_val=(gint *)g_tree_lookup(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]))) == NULL ){
flowd_p = (guint*)g_malloc0(sizeof(gint));
flowd_p = g_new0(guint, 1);
*flowd_p = (1U<<flowd); /*Set the bit to mark it as true*/
g_tree_insert(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]), flowd_p);
@ -1413,7 +1413,7 @@ if(state_dec >= 0 && state_dec <= 3) {
/*If it doesn't exists, insert it*/
if( (cur_val=(gint *)g_tree_lookup(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]))) == NULL ){
flowd_p = (guint*)g_malloc0(sizeof(gint));
flowd_p = g_new0(guint, 1);
*flowd_p = (1U<<flowd); /* Set the bit to mark it as true*/
g_tree_insert(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]), flowd_p);
@ -1740,4 +1740,4 @@ private_data_set_rlc_ciphering_sqn(actx, rlc_ciphering_sqn);
col_append_str(actx->pinfo->cinfo, COL_INFO, "Scheduling Block 3");
%(DEFAULT_BODY)s
#.END
#.END

4
epan/dissectors/packet-rrc.c
View File

@ -46484,7 +46484,7 @@ dissect_rrc_DL_TransportChannelType_r5(tvbuff_t *tvb _U_, int offset _U_, asn1_c
/*If it doesn't exists, insert it*/
if( (cur_val=(gint *)g_tree_lookup(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]))) == NULL ){
flowd_p = (guint*)g_malloc0(sizeof(gint));
flowd_p = g_new0(guint, 1);
*flowd_p = (1U<<flowd); /*Set the bit to mark it as true*/
g_tree_insert(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]), flowd_p);
@ -49959,7 +49959,7 @@ dissect_rrc_DL_TransportChannelType_r7(tvbuff_t *tvb _U_, int offset _U_, asn1_c
/*If it doesn't exists, insert it*/
if( (cur_val=(gint *)g_tree_lookup(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]))) == NULL ){
flowd_p = (guint*)g_malloc0(sizeof(gint));
flowd_p = g_new0(guint, 1);
*flowd_p = (1U<<flowd); /* Set the bit to mark it as true*/
g_tree_insert(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]), flowd_p);