From 31bb300f81b8e36099dbe6d0a18a5e4d9dacaee1 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 7 Dec 2012 08:38:04 +1100 Subject: [PATCH] AP_HAL_AVR: fixed bounds check for rc input --- libraries/AP_HAL_AVR/RCInput_APM1.cpp | 2 +- libraries/AP_HAL_AVR/RCInput_APM2.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_HAL_AVR/RCInput_APM1.cpp b/libraries/AP_HAL_AVR/RCInput_APM1.cpp index 50d4f50a4b..4f2998c1ff 100644 --- a/libraries/AP_HAL_AVR/RCInput_APM1.cpp +++ b/libraries/AP_HAL_AVR/RCInput_APM1.cpp @@ -84,7 +84,7 @@ static inline uint16_t constrain_pulse(uint16_t p) { uint16_t APM1RCInput::read(uint8_t ch) { /* constrain ch */ - if (ch < AVR_RC_INPUT_NUM_CHANNELS) return 0; + if (ch >= AVR_RC_INPUT_NUM_CHANNELS) return 0; /* grab channel from isr's memory in critical section*/ cli(); uint16_t capt = _pulse_capt[ch]; diff --git a/libraries/AP_HAL_AVR/RCInput_APM2.cpp b/libraries/AP_HAL_AVR/RCInput_APM2.cpp index 478a550b14..0e4d883f8c 100644 --- a/libraries/AP_HAL_AVR/RCInput_APM2.cpp +++ b/libraries/AP_HAL_AVR/RCInput_APM2.cpp @@ -84,7 +84,7 @@ static inline uint16_t constrain_pulse(uint16_t p) { uint16_t APM2RCInput::read(uint8_t ch) { /* constrain ch */ - if (ch < AVR_RC_INPUT_NUM_CHANNELS) return 0; + if (ch >= AVR_RC_INPUT_NUM_CHANNELS) return 0; /* grab channel from isr's memory in critical section*/ cli(); uint16_t capt = _pulse_capt[ch];