andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

command read with no args crashed EMS-ESP

Browse Source
This commit is contained in:
proddy
2025-02-02 17:16:32 +01:00
parent 6df7965bb2
commit 7dfa8fc883
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/system.cpp
View File

@@ -103,6 +103,7 @@ bool System::command_send(const char * value, const int8_t id) {
return EMSESP::txservice_.send_raw(value); // ignore id return EMSESP::txservice_.send_raw(value); // ignore id
} }
// returns last response from MQTT
bool System::command_response(const char * value, const int8_t id, JsonObject output) { bool System::command_response(const char * value, const int8_t id, JsonObject output) {
JsonDocument doc; JsonDocument doc;
if (DeserializationError::Ok == deserializeJson(doc, Mqtt::get_response())) { if (DeserializationError::Ok == deserializeJson(doc, Mqtt::get_response())) {
@@ -1159,7 +1160,7 @@ bool System::check_restore() {
// returns true if we need a reboot // returns true if we need a reboot
bool System::check_upgrade(bool factory_settings) { bool System::check_upgrade(bool factory_settings) {
bool missing_version = true; bool missing_version = true;
std::string settingsVersion{EMSESP_APP_VERSION}; // default setting version std::string settingsVersion;
if (!factory_settings) { if (!factory_settings) {
// fetch current version from settings file // fetch current version from settings file
@@ -1171,6 +1172,8 @@ bool System::check_upgrade(bool factory_settings) {
LOG_WARNING("No version information found"); LOG_WARNING("No version information found");
settingsVersion = "3.5.0"; // this was the last stable version without version info settingsVersion = "3.5.0"; // this was the last stable version without version info
} }
} else {
settingsVersion = EMSESP_APP_VERSION; // use the current version
} }
version::Semver200_version settings_version(settingsVersion); version::Semver200_version settings_version(settingsVersion);
@@ -2083,7 +2086,12 @@ bool System::uploadFirmwareURL(const char * url) {
} }
// read command, e.g. read <deviceID> <type ID> [offset] [length] from console or API // read command, e.g. read <deviceID> <type ID> [offset] [length] from console or API
// from Console use quotes so: call system read "<deviceID> <type ID> [offset] [length]"
bool System::readCommand(const char * data) { bool System::readCommand(const char * data) {
if (!data) {
return false;
}
// extract <deviceID> <type ID> [offset] [length] from string // extract <deviceID> <type ID> [offset] [length] from string
char * p; char * p;
char value[11]; char value[11];
@@ -2102,7 +2110,7 @@ bool System::readCommand(const char * data) {
strlcpy(value, p, 10); // get string strlcpy(value, p, 10); // get string
device_id = (uint8_t)Helpers::hextoint(value); // convert hex to int device_id = (uint8_t)Helpers::hextoint(value); // convert hex to int
if (!EMSESP::valid_device(device_id)) { if (!EMSESP::valid_device(device_id)) {
LOG_ERROR("Invalid device ID (%d) for read command", device_id); LOG_ERROR("Invalid device ID (%d) in read command", device_id);
return false; // invalid device return false; // invalid device
} }
} }