jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 05:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix command Scale buffer overflow

Browse Source 
Fix command Scale buffer overflow (#3236)
This commit is contained in:
Theo Arends 2018-07-16 12:37:49 +02:00
parent b56961c528
commit 9ef10f24d2
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sonoff/_changelog.ino
View File

@ -1,4 +1,5 @@
/* 6.1.1b /* 6.1.1b
* Fix command Scale buffer overflow (#3236)
* Fix rules once regression from v6.1.0 (#3198, #3226) * Fix rules once regression from v6.1.0 (#3198, #3226)
* Add default Wifi Configuration tool as define WIFI_CONFIG_NO_SSID in user_config.h if no SSID is configured (#3224) * Add default Wifi Configuration tool as define WIFI_CONFIG_NO_SSID in user_config.h if no SSID is configured (#3224)
* Add user selection of Wifi Smartconfig as define USE_SMARTCONFIG in user_config.h * Add user selection of Wifi Smartconfig as define USE_SMARTCONFIG in user_config.h

28
sonoff/xdrv_10_rules.ino
View File

@ -580,20 +580,14 @@ boolean RulesCommand()
else if ((CMND_SCALE == command_code) && (index > 0) && (index <= RULES_MAX_VARS)) { else if ((CMND_SCALE == command_code) && (index > 0) && (index <= RULES_MAX_VARS)) {
if (XdrvMailbox.data_len > 0) { if (XdrvMailbox.data_len > 0) {
if (strstr(XdrvMailbox.data, ",")) { // Process parameter entry if (strstr(XdrvMailbox.data, ",")) { // Process parameter entry
double value = 0; char sub_string[XdrvMailbox.data_len +1];
double valueIN = 0;
double fromLow = 0;
double fromHigh = 0;
double toLow = 0;
double toHigh = 0;
valueIN = CharToDouble(subStr(XdrvMailbox.data, ",", 1)); double valueIN = CharToDouble(subStr(sub_string, XdrvMailbox.data, ",", 1));
fromLow = CharToDouble(subStr(XdrvMailbox.data, ",", 2)); double fromLow = CharToDouble(subStr(sub_string, XdrvMailbox.data, ",", 2));
fromHigh = CharToDouble(subStr(XdrvMailbox.data, ",", 3)); double fromHigh = CharToDouble(subStr(sub_string, XdrvMailbox.data, ",", 3));
toLow = CharToDouble(subStr(XdrvMailbox.data, ",", 4)); double toLow = CharToDouble(subStr(sub_string, XdrvMailbox.data, ",", 4));
toHigh = CharToDouble(subStr(XdrvMailbox.data, ",", 5)); double toHigh = CharToDouble(subStr(sub_string, XdrvMailbox.data, ",", 5));
double value = map_double(valueIN, fromLow, fromHigh, toLow, toHigh);
value = map_double(valueIN, fromLow, fromHigh, toLow, toHigh);
dtostrfd(value, 2, vars[index -1]); dtostrfd(value, 2, vars[index -1]);
} }
} }
@ -610,17 +604,16 @@ double map_double(double x, double in_min, double in_max, double out_min, double
} }
// Function to return a substring defined by a delimiter at an index // Function to return a substring defined by a delimiter at an index
char* subStr (char* str, const char *delim, int index) char* subStr(char* dest, char* str, const char *delim, int index)
{ {
char *act; char *act;
char *sub; char *sub;
char *ptr; char *ptr;
static char copy[10];
int i; int i;
// Since strtok consumes the first arg, make a copy // Since strtok consumes the first arg, make a copy
strcpy(copy, str); strncpy(dest, str, strlen(str));
for (i = 1, act = copy; i <= index; i++, act = NULL) { for (i = 1, act = dest; i <= index; i++, act = NULL) {
sub = strtok_r(act, delim, &ptr); sub = strtok_r(act, delim, &ptr);
if (sub == NULL) break; if (sub == NULL) break;
} }
@ -628,7 +621,6 @@ char* subStr (char* str, const char *delim, int index)
return sub; return sub;
} }
/*********************************************************************************************\ /*********************************************************************************************\
* Interface * Interface
\*********************************************************************************************/ \*********************************************************************************************/