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

NBAP: copy address in pinfo->pool 

They are copied in structures using pinfo lifetime. Let's use the same scope.

Bug: 14416
Change-Id: I5f8ee6fff49d63584a246936f551db1803ff9816
Reviewed-on: https://code.wireshark.org/review/25748
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Pascal Quantin 2018-02-12 10:37:00 +01:00 committed by Anders Broman
parent ae91f43155
commit 27b571e62f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/dissectors/asn1/nbap/nbap.cnf
View File

@ -1483,7 +1483,7 @@ private_data_set_binding_id_port(actx->pinfo, 0);
}
/* Set address for collection of DDI entries */
copy_address(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr);
copy_address_wmem(actx->pinfo->pool,&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr);
nbap_edch_channel_info[e_dch_macdflow_id].crnc_port = bindingID;
set_umts_fp_conv_data(conversation, umts_fp_conversation_info);
@ -1631,7 +1631,7 @@ private_data_set_binding_id_port(actx->pinfo, 0);
/* Set address for collection of DDI entries */
e_dch_macdflow_id = private_data_get_e_dch_macdflow_id(actx->pinfo);
copy_address(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr);
copy_address_wmem(actx->pinfo->pool,&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr);
nbap_edch_channel_info[e_dch_macdflow_id].crnc_port = bindingID;
@ -1893,7 +1893,7 @@ nbap_edch_channel_info = private_data_get_nbap_edch_channel_info(actx->pinfo);
/* Set address for collection of HSDSCH entries */
hsdsch_macdflow_id = private_data_get_hsdsch_macdflow_id(actx->pinfo);
copy_address(&(nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_address),&dst_addr);
copy_address_wmem(actx->pinfo->pool,&(nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_address),&dst_addr);
nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_port = bindingID;
@ -2049,7 +2049,7 @@ nbap_hsdsch_channel_info = private_data_get_nbap_hsdsch_channel_info(actx->pinfo
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
/* Set address for collection of HSDSCH entries */
copy_address(&(nbap_hsdsch_channel_info[private_data_get_hsdsch_macdflow_id(actx->pinfo)].crnc_address),&dst_addr);
copy_address_wmem(actx->pinfo->pool,&(nbap_hsdsch_channel_info[private_data_get_hsdsch_macdflow_id(actx->pinfo)].crnc_address),&dst_addr);
nbap_hsdsch_channel_info[private_data_get_hsdsch_macdflow_id(actx->pinfo)].crnc_port = bindingID;
@ -2197,7 +2197,7 @@ private_data_set_common_macdflow_id(actx->pinfo, common_macdflow_id);
/* Set address for collection of common entries */
common_macdflow_id = private_data_get_common_macdflow_id(actx->pinfo);
copy_address(&(nbap_common_channel_info[common_macdflow_id].crnc_address),&dst_addr);
copy_address_wmem(actx->pinfo->pool,&(nbap_common_channel_info[common_macdflow_id].crnc_address),&dst_addr);
nbap_common_channel_info[common_macdflow_id].crnc_port = private_data_get_binding_id_port(actx->pinfo);

10
epan/dissectors/packet-nbap.c
View File

@ -12648,7 +12648,7 @@ dissect_nbap_CommonMACFlow_Specific_InfoItem(tvbuff_t *tvb _U_, int offset _U_,
/* Set address for collection of common entries */
common_macdflow_id = private_data_get_common_macdflow_id(actx->pinfo);
copy_address(&(nbap_common_channel_info[common_macdflow_id].crnc_address),&dst_addr);
copy_address_wmem(actx->pinfo->pool,&(nbap_common_channel_info[common_macdflow_id].crnc_address),&dst_addr);
nbap_common_channel_info[common_macdflow_id].crnc_port = private_data_get_binding_id_port(actx->pinfo);
@ -19341,7 +19341,7 @@ private_data_set_binding_id_port(actx->pinfo, 0);
/* Set address for collection of DDI entries */
e_dch_macdflow_id = private_data_get_e_dch_macdflow_id(actx->pinfo);
copy_address(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr);
copy_address_wmem(actx->pinfo->pool,&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr);
nbap_edch_channel_info[e_dch_macdflow_id].crnc_port = bindingID;
@ -24171,7 +24171,7 @@ dissect_nbap_HSDSCH_MACdFlow_Specific_InfoItem(tvbuff_t *tvb _U_, int offset _U_
/* Set address for collection of HSDSCH entries */
hsdsch_macdflow_id = private_data_get_hsdsch_macdflow_id(actx->pinfo);
copy_address(&(nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_address),&dst_addr);
copy_address_wmem(actx->pinfo->pool,&(nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_address),&dst_addr);
nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_port = bindingID;
@ -24613,7 +24613,7 @@ dissect_nbap_HSDSCH_MACdFlow_Specific_InfoItem_to_Modify(tvbuff_t *tvb _U_, int
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
/* Set address for collection of HSDSCH entries */
copy_address(&(nbap_hsdsch_channel_info[private_data_get_hsdsch_macdflow_id(actx->pinfo)].crnc_address),&dst_addr);
copy_address_wmem(actx->pinfo->pool,&(nbap_hsdsch_channel_info[private_data_get_hsdsch_macdflow_id(actx->pinfo)].crnc_address),&dst_addr);
nbap_hsdsch_channel_info[private_data_get_hsdsch_macdflow_id(actx->pinfo)].crnc_port = bindingID;
@ -29619,7 +29619,7 @@ private_data_set_binding_id_port(actx->pinfo, 0);
}
/* Set address for collection of DDI entries */
copy_address(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr);
copy_address_wmem(actx->pinfo->pool,&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr);
nbap_edch_channel_info[e_dch_macdflow_id].crnc_port = bindingID;
set_umts_fp_conv_data(conversation, umts_fp_conversation_info);