From 9f64ced6100b8572353df4f8ac8d27146a77960a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Sch=C3=B6n?= <mail@dennis-schoen.de>
Date: Sun, 24 Nov 2024 16:59:05 +0100
Subject: [PATCH] Fix bounds checks in FGFCS (#1191)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dennis Schön <dennis.schoen@helsing.ai>
---
 src/models/FGFCS.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/models/FGFCS.cpp b/src/models/FGFCS.cpp
index 09d172642..f012d9058 100644
--- a/src/models/FGFCS.cpp
+++ b/src/models/FGFCS.cpp
@@ -319,7 +319,7 @@ void FGFCS::SetDspPos( int form , double pos )
 
 void FGFCS::SetThrottleCmd(int engineNum, double setting)
 {
-  if (engineNum < (int)ThrottlePos.size()) {
+  if (engineNum < (int)ThrottleCmd.size()) {
     if (engineNum < 0) {
       for (unsigned int ctr=0; ctr<ThrottleCmd.size(); ctr++)
         ThrottleCmd[ctr] = setting;
@@ -357,7 +357,7 @@ void FGFCS::SetThrottlePos(int engineNum, double setting)
 
 double FGFCS::GetThrottleCmd(int engineNum) const
 {
-  if (engineNum < (int)ThrottlePos.size()) {
+  if (engineNum < (int)ThrottleCmd.size()) {
     if (engineNum < 0) {
       FGLogging log(FDMExec->GetLogger(), LogLevel::ERROR);
       log << "Cannot get throttle value for ALL engines" << endl;
@@ -397,7 +397,7 @@ double FGFCS::GetThrottlePos(int engineNum) const
 
 void FGFCS::SetMixtureCmd(int engineNum, double setting)
 {
-  if (engineNum < (int)ThrottlePos.size()) {
+  if (engineNum < (int)MixtureCmd.size()) {
     if (engineNum < 0) {
       for (unsigned int ctr=0; ctr<MixtureCmd.size(); ctr++)
         MixtureCmd[ctr] = setting;
@@ -411,7 +411,7 @@ void FGFCS::SetMixtureCmd(int engineNum, double setting)
 
 void FGFCS::SetMixturePos(int engineNum, double setting)
 {
-  if (engineNum < (int)ThrottlePos.size()) {
+  if (engineNum < (int)MixturePos.size()) {
     if (engineNum < 0) {
       for (unsigned int ctr=0; ctr<MixtureCmd.size(); ctr++)
         MixturePos[ctr] = MixtureCmd[ctr];
@@ -425,7 +425,7 @@ void FGFCS::SetMixturePos(int engineNum, double setting)
 
 void FGFCS::SetPropAdvanceCmd(int engineNum, double setting)
 {
-  if (engineNum < (int)ThrottlePos.size()) {
+  if (engineNum < (int)PropAdvanceCmd.size()) {
     if (engineNum < 0) {
       for (unsigned int ctr=0; ctr<PropAdvanceCmd.size(); ctr++)
         PropAdvanceCmd[ctr] = setting;
@@ -439,7 +439,7 @@ void FGFCS::SetPropAdvanceCmd(int engineNum, double setting)
 
 void FGFCS::SetPropAdvance(int engineNum, double setting)
 {
-  if (engineNum < (int)ThrottlePos.size()) {
+  if (engineNum < (int)PropAdvance.size()) {
     if (engineNum < 0) {
       for (unsigned int ctr=0; ctr<PropAdvanceCmd.size(); ctr++)
         PropAdvance[ctr] = PropAdvanceCmd[ctr];
@@ -453,7 +453,7 @@ void FGFCS::SetPropAdvance(int engineNum, double setting)
 
 void FGFCS::SetFeatherCmd(int engineNum, bool setting)
 {
-  if (engineNum < (int)ThrottlePos.size()) {
+  if (engineNum < (int)PropFeatherCmd.size()) {
     if (engineNum < 0) {
       for (unsigned int ctr=0; ctr<PropFeatherCmd.size(); ctr++)
         PropFeatherCmd[ctr] = setting;
@@ -467,7 +467,7 @@ void FGFCS::SetFeatherCmd(int engineNum, bool setting)
 
 void FGFCS::SetPropFeather(int engineNum, bool setting)
 {
-  if (engineNum < (int)ThrottlePos.size()) {
+  if (engineNum < (int)PropFeather.size()) {
     if (engineNum < 0) {
       for (unsigned int ctr=0; ctr<PropFeatherCmd.size(); ctr++)
         PropFeather[ctr] = PropFeatherCmd[ctr];