From cf1d4762331881dbfa511de9459757091ce8e370 Mon Sep 17 00:00:00 2001 From: Steve Evans Date: Tue, 6 Feb 2024 12:43:39 +0000 Subject: [PATCH] Ensure MSP channel data is valid (#13352) --- src/main/rx/msp_override.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/rx/msp_override.c b/src/main/rx/msp_override.c index 5411ad18cbb..33eee15653f 100644 --- a/src/main/rx/msp_override.c +++ b/src/main/rx/msp_override.c @@ -32,7 +32,8 @@ uint16_t rxMspOverrideReadRawRc(const rxRuntimeState_t *rxRuntimeState, const rx { uint16_t rxSample = (rxRuntimeState->rcReadRawFn)(rxRuntimeState, chan); - uint16_t overrideSample = rxMspReadRawRC(rxRuntimeState, chan); + uint16_t overrideSample = constrainf(rxMspReadRawRC(rxRuntimeState, chan), rxConfig->rx_min_usec, rxConfig->rx_max_usec); + bool override = (1 << chan) & rxConfig->msp_override_channels_mask; if (IS_RC_MODE_ACTIVE(BOXMSPOVERRIDE) && override) {