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

fix use after free

Browse Source
This commit is contained in:
MichaelDvP
2025-10-17 10:41:32 +02:00
parent 13bf2c44e7
commit d92361a8bb
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/command.cpp
View File

@@ -52,9 +52,6 @@ uint8_t Command::process(const char * path, const bool is_admin, const JsonObjec
return json_message(CommandRet::ERROR, "missing command in path", output); return json_message(CommandRet::ERROR, "missing command in path", output);
} }
std::string cmd_s;
int8_t id_n = -1; // default hc
// check for a device as first item in the path // check for a device as first item in the path
const char * device_s = nullptr; const char * device_s = nullptr;
if (!num_paths) { if (!num_paths) {
@@ -79,16 +76,15 @@ uint8_t Command::process(const char * path, const bool is_admin, const JsonObjec
// the next value on the path should be the command or entity name // the next value on the path should be the command or entity name
const char * command_p = nullptr; const char * command_p = nullptr;
char command[COMMAND_MAX_LENGTH];
if (num_paths == 2) { if (num_paths == 2) {
command_p = p.paths()[1].c_str(); command_p = p.paths()[1].c_str();
} else if (num_paths == 3) { } else if (num_paths == 3) {
// concatenate the path into one string as it could be in the format 'hc/XXX' // concatenate the path into one string as it could be in the format 'hc/XXX'
char command[COMMAND_MAX_LENGTH];
snprintf(command, sizeof(command), "%s/%s", p.paths()[1].c_str(), p.paths()[2].c_str()); snprintf(command, sizeof(command), "%s/%s", p.paths()[1].c_str(), p.paths()[2].c_str());
command_p = command; command_p = command;
} else if (num_paths > 3) { } else if (num_paths > 3) {
// concatenate the path into one string as it could be in the format 'hc/XXX/attribute' // concatenate the path into one string as it could be in the format 'hc/XXX/attribute'
char command[COMMAND_MAX_LENGTH];
snprintf(command, sizeof(command), "%s/%s/%s", p.paths()[1].c_str(), p.paths()[2].c_str(), p.paths()[3].c_str()); snprintf(command, sizeof(command), "%s/%s/%s", p.paths()[1].c_str(), p.paths()[2].c_str(), p.paths()[3].c_str());
command_p = command; command_p = command;
} else { } else {
@@ -100,6 +96,7 @@ uint8_t Command::process(const char * path, const bool is_admin, const JsonObjec
} }
} }
int8_t id_n = -1; // default hc
// some commands may be prefixed with hc. dhw. or hc/ or dhw/ so extract these if they exist // some commands may be prefixed with hc. dhw. or hc/ or dhw/ so extract these if they exist
// parse_command_string returns the extracted command // parse_command_string returns the extracted command
if (device_type >= EMSdevice::DeviceType::BOILER) { if (device_type >= EMSdevice::DeviceType::BOILER) {