Skip to content

Commit

Permalink
Fix buffer overflow in JETIEXBUS character reception (#13130) (#13136)
Browse files Browse the repository at this point in the history
* Fix buffer overflow in jetiexbus character reception

* Update src/main/rx/jetiexbus.c



---------

Co-authored-by: Steve Evans <SteveCEvans@users.noreply.github.com>
  • Loading branch information
haslinghuis and SteveCEvans committed Oct 23, 2023
1 parent 0d9ab29 commit 738127e
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/main/rx/jetiexbus.c
Expand Up @@ -153,6 +153,7 @@ static void jetiExBusDataReceive(uint16_t c, void *data)

static timeUs_t jetiExBusTimeLast = 0;
static uint8_t *jetiExBusFrame;
static uint8_t jetiExBusFrameMaxSize;
const timeUs_t now = microsISR();

// Check if we shall reset frame position due to time
Expand All @@ -169,18 +170,29 @@ static void jetiExBusDataReceive(uint16_t c, void *data)
case EXBUS_START_CHANNEL_FRAME:
jetiExBusFrameState = EXBUS_STATE_IN_PROGRESS;
jetiExBusFrame = jetiExBusChannelFrame;
jetiExBusFrameMaxSize = EXBUS_MAX_CHANNEL_FRAME_SIZE;
break;

case EXBUS_START_REQUEST_FRAME:
jetiExBusRequestState = EXBUS_STATE_IN_PROGRESS;
jetiExBusFrame = jetiExBusRequestFrame;
jetiExBusFrameMaxSize = EXBUS_MAX_REQUEST_FRAME_SIZE;
break;

default:
return;
}
}

if (jetiExBusFramePosition == jetiExBusFrameMaxSize) {
// frame overrun
jetiExBusFrameReset();
jetiExBusFrameState = EXBUS_STATE_ZERO;
jetiExBusRequestState = EXBUS_STATE_ZERO;

return;
}

// Store in frame copy
jetiExBusFrame[jetiExBusFramePosition] = (uint8_t)c;
jetiExBusFramePosition++;
Expand Down

0 comments on commit 738127e

Please sign in to comment.