jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-19 01:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix memcpy overrun and TasmotaClient rename

Browse Source
This commit is contained in:
fvanroie 2021-02-17 14:43:50 +01:00
parent 7009c10c97
commit 1c6ea7c38f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hasp/hasp_dispatch.cpp
View File

@ -19,6 +19,7 @@
#if HASP_USE_DEBUG > 0 #if HASP_USE_DEBUG > 0
#include "../hasp_debug.h" #include "../hasp_debug.h"
#include "hasp_gui.h" // for screenshot
#if WINDOWS #if WINDOWS
#include <iostream> #include <iostream>
@ -30,11 +31,10 @@
#include "CharStream.h" #include "CharStream.h"
#include "hasp_oobe.h" #include "hasp_oobe.h"
#include "hasp_gui.h" // for screenshot
#include "sys/gpio/hasp_gpio.h" #include "sys/gpio/hasp_gpio.h"
#include "hal/hasp_hal.h" #include "hal/hasp_hal.h"
#include "svc/hasp_ota.h" #include "sys/svc/hasp_ota.h"
#include "mqtt/hasp_mqtt.h" #include "mqtt/hasp_mqtt.h"
#include "sys/net/hasp_network.h" // for network_get_status() #include "sys/net/hasp_network.h" // for network_get_status()
#endif #endif
@ -329,13 +329,13 @@ void dispatch_output_idle_state(uint8_t state)
char payload[6]; char payload[6];
switch(state) { switch(state) {
case HASP_SLEEP_LONG: case HASP_SLEEP_LONG:
memcpy_P(payload, PSTR("LONG"), sizeof(payload)); memcpy_P(payload, PSTR("LONG"), 5);
break; break;
case HASP_SLEEP_SHORT: case HASP_SLEEP_SHORT:
memcpy_P(payload, PSTR("SHORT"), sizeof(payload)); memcpy_P(payload, PSTR("SHORT"), 6);
break; break;
default: default:
memcpy_P(payload, PSTR("OFF"), sizeof(payload)); memcpy_P(payload, PSTR("OFF"), 4);
} }
dispatch_state_msg(F("idle"), payload); dispatch_state_msg(F("idle"), payload);
} }
@ -571,13 +571,13 @@ void dispatch_object_value_changed(lv_obj_t * obj, int16_t state)
/********************************************** Output States ******************************************/ /********************************************** Output States ******************************************/
static inline void dispatch_state_msg(const __FlashStringHelper * subtopic, const char * payload) static inline void dispatch_state_msg(const __FlashStringHelper * subtopic, const char * payload)
{ {
#if !defined(HASP_USE_MQTT) && !defined(HASP_USE_TASMOTA_SLAVE) #if !defined(HASP_USE_MQTT) && !defined(HASP_USE_TASMOTA_CLIENT)
LOG_TRACE(TAG_MSGR, F("%s => %s"), String(subtopic).c_str(), payload); LOG_TRACE(TAG_MSGR, F("%s => %s"), String(subtopic).c_str(), payload);
#else #else
#if HASP_USE_MQTT > 0 #if HASP_USE_MQTT > 0
mqtt_send_state(subtopic, payload); mqtt_send_state(subtopic, payload);
#endif #endif
#if HASP_USE_TASMOTA_SLAVE > 0 #if HASP_USE_TASMOTA_CLIENT > 0
slave_send_state(subtopic, payload); slave_send_state(subtopic, payload);
#endif #endif
#endif #endif
@ -895,9 +895,10 @@ void dispatch_output_statusupdate(const char *, const char *)
char data[3 * 128]; char data[3 * 128];
{ {
/*
char buffer[128]; char buffer[128];
/* haspGetVersion(buffer, sizeof(buffer)); haspGetVersion(buffer, sizeof(buffer));
snprintf_P(data, sizeof(data), snprintf_P(data, sizeof(data),
PSTR("{\"node\":\"%s\",\"status\":\"available\",\"version\":\"%s\",\"uptime\":%lu,"), PSTR("{\"node\":\"%s\",\"status\":\"available\",\"version\":\"%s\",\"uptime\":%lu,"),
mqttGetNodename().c_str(), buffer, long(millis() / 1000)); mqttGetNodename().c_str(), buffer, long(millis() / 1000));