maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix PRACH PDU beamforming allocation to allocate at least 1 member, avoiding creating vector of size 0

Browse Source
This commit is contained in:
Rúben Soares da Silva
2023-11-02 10:55:50 +00:00
parent 82597e7e8f
commit c22fe2bab6
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
+8 -4
View File
@@ -941,11 +941,13 @@ static uint8_t pack_ul_tti_request_prach_pdu(nfapi_nr_prach_pdu_t *prach_pdu, ui
prach_pdu->beamforming.dig_bf_interface = 0; prach_pdu->beamforming.dig_bf_interface = 0;
if (prach_pdu->beamforming.prgs_list == NULL) { if (prach_pdu->beamforming.prgs_list == NULL) {
prach_pdu->beamforming.prgs_list = calloc(prach_pdu->beamforming.num_prgs, sizeof(*prach_pdu->beamforming.prgs_list)); prach_pdu->beamforming.prgs_list = calloc(prach_pdu->beamforming.num_prgs == 0 ? 1 : prach_pdu->beamforming.num_prgs,
sizeof(*prach_pdu->beamforming.prgs_list));
} }
if (prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list == NULL) { if (prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list == NULL) {
prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list = prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list =
calloc(prach_pdu->beamforming.dig_bf_interface, sizeof(*prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list)); calloc(prach_pdu->beamforming.dig_bf_interface == 0 ? 1 : prach_pdu->beamforming.dig_bf_interface,
sizeof(*prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list));
} }
prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list[0].beam_idx = 0; prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list[0].beam_idx = 0;
@@ -4771,11 +4773,13 @@ static uint8_t unpack_ul_tti_request_prach_pdu(void *tlv, uint8_t **ppReadPacked
} }
// TODO: ignoring beamforming tlv for now // TODO: ignoring beamforming tlv for now
if (prach_pdu->beamforming.prgs_list == NULL) { if (prach_pdu->beamforming.prgs_list == NULL) {
prach_pdu->beamforming.prgs_list = calloc(prach_pdu->beamforming.num_prgs, sizeof(*prach_pdu->beamforming.prgs_list)); prach_pdu->beamforming.prgs_list = calloc(prach_pdu->beamforming.num_prgs == 0 ? 1 : prach_pdu->beamforming.num_prgs,
sizeof(*prach_pdu->beamforming.prgs_list));
} }
if (prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list == NULL) { if (prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list == NULL) {
prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list = prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list =
calloc(prach_pdu->beamforming.dig_bf_interface, sizeof(*prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list)); calloc(prach_pdu->beamforming.dig_bf_interface == 0 ? 1 : prach_pdu->beamforming.dig_bf_interface,
sizeof(*prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list));
} }
// Pack RX Beamforming PDU // Pack RX Beamforming PDU
if (!(pull16(ppReadPackedMsg, &prach_pdu->beamforming.num_prgs, end) if (!(pull16(ppReadPackedMsg, &prach_pdu->beamforming.num_prgs, end)