diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-02-12 10:37:00 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-02-12 11:16:18 +0000 |
| commit | 27b571e62f6a672804c6f8e7b0558ccfb589cf9b (patch) | |
| tree | 1cd46a202e1c90efdb8247ad257509c18a2e671d /epan/dissectors/asn1 | |
| parent | ae91f43155662d857b6e4e07a67c244f921e0a8b (diff) | |
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>
Diffstat (limited to 'epan/dissectors/asn1')
| -rw-r--r-- | epan/dissectors/asn1/nbap/nbap.cnf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/asn1/nbap/nbap.cnf b/epan/dissectors/asn1/nbap/nbap.cnf index 36cfff928d..d3bdcc9b75 100644 --- a/epan/dissectors/asn1/nbap/nbap.cnf +++ b/epan/dissectors/asn1/nbap/nbap.cnf @@ -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); |