PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nbiot_sync: fix potential segfault during sync when time gap is too big

This commit is contained in:
Andre Puschmann 2020-04-29 18:51:41 +02:00
parent 3f99e40159
commit 2c6a95c1d5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/phy/rf/rf_utils.c
View File

@ -79,11 +79,11 @@ free_and_exit:
return ret;
}
int srslte_rf_recv_wrapper_cs(void* h, cf_t* data[SRSLTE_MAX_CHANNELS], uint32_t nsamples, srslte_timestamp_t* t)
int srslte_rf_recv_wrapper_cs(void* h, cf_t* data[SRSLTE_MAX_PORTS], uint32_t nsamples, srslte_timestamp_t* t)
{
DEBUG(" ---- Receive %d samples ---- \n", nsamples);
void* ptr[SRSLTE_MAX_CHANNELS];
for (int i = 0; i < SRSLTE_MAX_CHANNELS; i++) {
void* ptr[SRSLTE_MAX_CHANNELS] = {};
for (int i = 0; i < SRSLTE_MAX_PORTS; i++) {
ptr[i] = data[i];
}
return srslte_rf_recv_with_time_multi(h, ptr, nsamples, 1, NULL, NULL);

3
lib/src/phy/ue/ue_sync_nbiot.c
View File

@ -483,6 +483,9 @@ static int receive_samples(srslte_nbiot_ue_sync_t* q, cf_t* input_buffer[SRSLTE_
ptr[i] = &input_buffer[i][q->next_rf_sample_offset];
}
// assure next_rf_sample_offset isn't larger than frame_len
q->next_rf_sample_offset = SRSLTE_MIN(q->next_rf_sample_offset, q->frame_len);
if (q->recv_callback(q->stream, ptr, q->frame_len - q->next_rf_sample_offset, &q->last_timestamp) < 0) {
return SRSLTE_ERROR;
}