From 9fc0bc19e73aa929b5f8c5912dc42dcd02e6ce24 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Mon, 5 Dec 2016 17:19:01 +0900 Subject: [PATCH] AP_Beacon: fix potential out-of-bounds write to beacon_state uncovered by covarity and wickedshell --- libraries/AP_Beacon/AP_Beacon_Backend.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Beacon/AP_Beacon_Backend.cpp b/libraries/AP_Beacon/AP_Beacon_Backend.cpp index 312bbefac2..11152607f3 100644 --- a/libraries/AP_Beacon/AP_Beacon_Backend.cpp +++ b/libraries/AP_Beacon/AP_Beacon_Backend.cpp @@ -38,7 +38,7 @@ void AP_Beacon_Backend::set_vehicle_position(const Vector3f& pos, float accuracy void AP_Beacon_Backend::set_beacon_distance(uint8_t beacon_instance, float distance) { // sanity check instance - if (beacon_instance > AP_BEACON_MAX_BEACONS) { + if (beacon_instance >= AP_BEACON_MAX_BEACONS) { return; } @@ -57,7 +57,7 @@ void AP_Beacon_Backend::set_beacon_distance(uint8_t beacon_instance, float dista void AP_Beacon_Backend::set_beacon_position(uint8_t beacon_instance, const Vector3f& pos) { // sanity check instance - if (beacon_instance > AP_BEACON_MAX_BEACONS) { + if (beacon_instance >= AP_BEACON_MAX_BEACONS) { return; }