Protect ring-buffer write from nullptr

master
Xavier Arteaga 4 years ago committed by Xavier Arteaga
parent 369cffec00
commit c2621cc4f8

@ -147,12 +147,22 @@ int srslte_ringbuffer_write_timed_block(srslte_ringbuffer_t* q, void* p, int nof
} else if (!q->active) { } else if (!q->active) {
ret = SRSLTE_SUCCESS; ret = SRSLTE_SUCCESS;
} else if (ret == SRSLTE_SUCCESS) { } else if (ret == SRSLTE_SUCCESS) {
if (w_bytes > q->capacity - q->wpm) { if (ptr != NULL) {
int x = q->capacity - q->wpm; if (w_bytes > q->capacity - q->wpm) {
memcpy(&q->buffer[q->wpm], ptr, x); int x = q->capacity - q->wpm;
memcpy(q->buffer, &ptr[x], w_bytes - x); memcpy(&q->buffer[q->wpm], ptr, x);
memcpy(q->buffer, &ptr[x], w_bytes - x);
} else {
memcpy(&q->buffer[q->wpm], ptr, w_bytes);
}
} else { } else {
memcpy(&q->buffer[q->wpm], ptr, w_bytes); if (w_bytes > q->capacity - q->wpm) {
int x = q->capacity - q->wpm;
memset(&q->buffer[q->wpm], 0, x);
memset(q->buffer, 0, w_bytes - x);
} else {
memset(&q->buffer[q->wpm], 0, w_bytes);
}
} }
q->wpm += w_bytes; q->wpm += w_bytes;
if (q->wpm >= q->capacity) { if (q->wpm >= q->capacity) {

Loading…
Cancel
Save