From 4df32f82470525542f863a2e2245a8729ffe79ca Mon Sep 17 00:00:00 2001 From: Max Paperno Date: Sat, 29 Apr 2017 07:29:53 -0400 Subject: [PATCH] [Companion] Prevent crash when importing (converting) more models than current radio can handle. --- companion/src/firmwares/opentx/opentxinterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index c5e6bebf3..67fff2d16 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -250,7 +250,7 @@ unsigned long OpenTxEepromInterface::load(RadioData &radioData, const uint8_t * radioData.models.resize(firmware->getCapability(Models)); } for (int i = 0; i < firmware->getCapability(Models); i++) { - if (!loadModelFromRLE(radioData.models[i], efile, i, version, radioData.generalSettings.variant)) { + if (i < (int)radioData.models.size() && !loadModelFromRLE(radioData.models[i], efile, i, version, radioData.generalSettings.variant)) { std::cout << " ko\n"; errors.set(UNKNOWN_ERROR); if (getCurrentFirmware()->getCapability(Models) == 0) {