mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix command Publish payload handling

This commit is contained in:
Theo Arends 2020-01-27 17:38:32 +01:00
parent bfb7f0c1b9
commit 42461aaaf3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasmota/xdrv_02_mqtt.ino
View File

@ -389,7 +389,7 @@ void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retain
} }
// update topic is "$aws/things/<topic>/shadow/update" // update topic is "$aws/things/<topic>/shadow/update"
snprintf_P(romram, sizeof(romram), PSTR("$aws/things/%s/shadow/update"), topic2); snprintf_P(romram, sizeof(romram), PSTR("$aws/things/%s/shadow/update"), topic2);
// copy buffer // copy buffer
char *mqtt_save = (char*) malloc(strlen(mqtt_data)+1); char *mqtt_save = (char*) malloc(strlen(mqtt_data)+1);
if (!mqtt_save) { return; } // abort if (!mqtt_save) { return; } // abort
@ -852,13 +852,13 @@ void CmndPrefix(void)
void CmndPublish(void) void CmndPublish(void)
{ {
if (XdrvMailbox.data_len > 0) { if (XdrvMailbox.data_len > 0) {
char *mqtt_part = strtok(XdrvMailbox.data, " "); char *payload_part;
char *mqtt_part = strtok_r(XdrvMailbox.data, " ", &payload_part);
if (mqtt_part) { if (mqtt_part) {
char stemp1[TOPSZ]; char stemp1[TOPSZ];
strlcpy(stemp1, mqtt_part, sizeof(stemp1)); strlcpy(stemp1, mqtt_part, sizeof(stemp1));
mqtt_part = strtok(nullptr, " "); if ((payload_part != nullptr) && strlen(payload_part)) {
if (mqtt_part) { strlcpy(mqtt_data, payload_part, sizeof(mqtt_data));
strlcpy(mqtt_data, mqtt_part, sizeof(mqtt_data));
} else { } else {
mqtt_data[0] = '\0'; mqtt_data[0] = '\0';
} }