piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Add more validation to rawswitch decode

Browse Source
This commit is contained in:
elecpower
2021-12-31 10:53:10 +01:00
committed by Raphael Coeffic
parent 1c7bece090
commit 245d64f521
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/constants.h
+2
View File
@@ -47,6 +47,8 @@
#define CPN_MAX_GYRO_ANALOGS 2
#define CPN_MAX_ANALOGS (CPN_MAX_STICKS + CPN_MAX_POTS + CPN_MAX_SLIDERS + CPN_MAX_MOUSE_ANALOGS + CPN_MAX_GYRO_ANALOGS)
#define CPN_MAX_SENSORS 60
#define CPN_MAX_SCRIPTS 9
#define CPN_MAX_SCRIPT_INPUTS 10
#define CPN_STR_APP_NAME QCoreApplication::translate("Companion", "EdgeTX Companion")
#define CPN_STR_TTL_INFO QCoreApplication::translate("Companion", "Information") // shared Title Case words, eg. for a window title or section heading
companion/src/firmwares/edgetx/yaml_rawsource.cpp
+23 -13
View File
@@ -133,15 +133,19 @@ RawSource YamlRawSourceDecode(const std::string& src_str)
if (val_len > 0 && val[0] == 'I') {
rhs = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, std::stoi(src_str.substr(1)));
int idx = std::stoi(src_str.substr(1));
if (idx < CPN_MAX_INPUTS)
rhs = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, idx);
} else if (val_len >= 2
&& val[0] == 'S'
&& val[1] >= 'A'
&& val[1] <= 'Z') {
rhs = RawSource(SOURCE_TYPE_SWITCH, val[1] - 'A');
int idx = val[1] - 'A';
if (idx < CPN_MAX_SWITCHES)
rhs = RawSource(SOURCE_TYPE_SWITCH, idx);
} else if (val_len > 4 &&
val[0] == 'l' &&
val[1] == 'u' &&
@@ -149,11 +153,12 @@ RawSource YamlRawSourceDecode(const std::string& src_str)
val[3] == '(') {
std::stringstream src(src_str.substr(4));
int script = 0, output = 0;
int script = 0, output = 0; // TODO: check rename outputs to inputs???
src >> script;
src.ignore();
src >> output;
rhs = RawSource(SOURCE_TYPE_LUA_OUTPUT, script * 16 + output);
if (script < CPN_MAX_SCRIPTS && output < CPN_MAX_SCRIPT_INPUTS)
rhs = RawSource(SOURCE_TYPE_LUA_OUTPUT, script * 16 + output);
} else if (val_len > 3 &&
val[0] == 'l' &&
@@ -163,7 +168,8 @@ RawSource YamlRawSourceDecode(const std::string& src_str)
std::stringstream src(src_str.substr(3));
int ls = 0;
src >> ls;
rhs = RawSource(SOURCE_TYPE_CUSTOM_SWITCH, ls);
if (ls < CPN_MAX_LOGICAL_SWITCHES)
rhs = RawSource(SOURCE_TYPE_CUSTOM_SWITCH, ls);
} else if (val_len > 3 &&
val[0] == 't' &&
@@ -173,8 +179,9 @@ RawSource YamlRawSourceDecode(const std::string& src_str)
std::stringstream src(src_str.substr(3));
int tr = 0;
src >> tr;
rhs = RawSource(SOURCE_TYPE_PPM, tr);
if (tr < getCurrentFirmware()->getCapability(TrainerInputs))
rhs = RawSource(SOURCE_TYPE_PPM, tr);
} else if (val_len > 3 &&
val[0] == 'c' &&
val[1] == 'h' &&
@@ -183,8 +190,9 @@ RawSource YamlRawSourceDecode(const std::string& src_str)
std::stringstream src(src_str.substr(3));
int ch = 0;
src >> ch;
rhs = RawSource(SOURCE_TYPE_CH, ch);
if (ch < CPN_MAX_CHNOUT)
rhs = RawSource(SOURCE_TYPE_CH, ch);
} else if (val_len > 3 &&
val[0] == 'g' &&
val[1] == 'v' &&
@@ -193,7 +201,8 @@ RawSource YamlRawSourceDecode(const std::string& src_str)
std::stringstream src(src_str.substr(3));
int gv = 0;
src >> gv;
rhs = RawSource(SOURCE_TYPE_GVAR, gv);
if (gv < CPN_MAX_GVARS)
rhs = RawSource(SOURCE_TYPE_GVAR, gv);
} else if (val_len > 5 &&
val[0] == 't' &&
@@ -217,7 +226,8 @@ RawSource YamlRawSourceDecode(const std::string& src_str)
int sensor = 0;
src >> sensor;
rhs = RawSource(SOURCE_TYPE_TELEMETRY, sensor * 3 + sign);
if (sensor < CPN_MAX_SENSORS)
rhs = RawSource(SOURCE_TYPE_TELEMETRY, sensor * 3 + sign);
} else {
@@ -253,7 +263,7 @@ RawSource YamlRawSourceDecode(const std::string& src_str)
rhs.index = 0;
}
}
return rhs;
}
companion/src/firmwares/modeldata.h
-2
View File
@@ -63,8 +63,6 @@ class RSSIAlarmData {
}
};
#define CPN_MAX_SCRIPTS 9
#define CPN_MAX_SCRIPT_INPUTS 10
class ScriptData {
public:
ScriptData() { clear(); }