Fix exception if no MQTT data

jonatanolofsson · Mar 3, 2018 · 15886c1 · 15886c1
1 parent a16e231
commit 15886c1
Show file tree

Hide file tree

Showing 24 changed files with 11 additions and 8 deletions.
diff --git a/lib/TasmotaMqtt-1.1.0/.gitignore → lib/TasmotaMqtt-1.1.1/.gitignore b/lib/TasmotaMqtt-1.1.0/.gitignore → lib/TasmotaMqtt-1.1.1/.gitignore
diff --git a/lib/TasmotaMqtt-1.1.0/README.md → lib/TasmotaMqtt-1.1.1/README.md b/lib/TasmotaMqtt-1.1.0/README.md → lib/TasmotaMqtt-1.1.1/README.md
diff --git a/...Mqtt-1.1.0/examples/mqtt_pub/mqtt_pub.ino → ...Mqtt-1.1.1/examples/mqtt_pub/mqtt_pub.ino b/...Mqtt-1.1.0/examples/mqtt_pub/mqtt_pub.ino → ...Mqtt-1.1.1/examples/mqtt_pub/mqtt_pub.ino
diff --git a/...Mqtt-1.1.0/examples/mqtt_sub/mqtt_sub.ino → ...Mqtt-1.1.1/examples/mqtt_sub/mqtt_sub.ino b/...Mqtt-1.1.0/examples/mqtt_sub/mqtt_sub.ino → ...Mqtt-1.1.1/examples/mqtt_sub/mqtt_sub.ino
diff --git a/lib/TasmotaMqtt-1.1.0/keywords.txt → lib/TasmotaMqtt-1.1.1/keywords.txt b/lib/TasmotaMqtt-1.1.0/keywords.txt → lib/TasmotaMqtt-1.1.1/keywords.txt
diff --git a/lib/TasmotaMqtt-1.1.0/library.properties → lib/TasmotaMqtt-1.1.1/library.properties b/lib/TasmotaMqtt-1.1.0/library.properties → lib/TasmotaMqtt-1.1.1/library.properties
diff --git a/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.cpp → lib/TasmotaMqtt-1.1.1/src/TasmotaMqtt.cpp b/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.cpp → lib/TasmotaMqtt-1.1.1/src/TasmotaMqtt.cpp
@@ -185,9 +185,10 @@ bool TasmotaMqtt::Connected()
 
 void TasmotaMqtt::_onMqttDataCb(const char* topic, uint32_t topic_len, const char* data, uint32_t data_len)
 {
-  char topic_copy[topic_len];
+	char topic_copy[topic_len +1];
 
-  memcpy(topic_copy, topic, topic_len);
-  topic_copy[topic_len] = 0;
+	memcpy(topic_copy, topic, topic_len);
+	topic_copy[topic_len] = 0;
+  if (0 == data_len) data = (const char*)&topic_copy + topic_len;
   onMqttDataCb((char*)topic_copy, (byte*)data, data_len);
 }
diff --git a/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.h → lib/TasmotaMqtt-1.1.1/src/TasmotaMqtt.h b/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.h → lib/TasmotaMqtt-1.1.1/src/TasmotaMqtt.h
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/debug.h → lib/TasmotaMqtt-1.1.1/src/mqtt/debug.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/debug.h → lib/TasmotaMqtt-1.1.1/src/mqtt/debug.h
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.c → lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt.c b/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.c → lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt.c
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.h → lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.h → lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt.h
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.c → lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt_msg.c b/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.c → lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt_msg.c
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.h → lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt_msg.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.h → lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt_msg.h
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/proto.c → lib/TasmotaMqtt-1.1.1/src/mqtt/proto.c b/lib/TasmotaMqtt-1.1.0/src/mqtt/proto.c → lib/TasmotaMqtt-1.1.1/src/mqtt/proto.c
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/proto.h → lib/TasmotaMqtt-1.1.1/src/mqtt/proto.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/proto.h → lib/TasmotaMqtt-1.1.1/src/mqtt/proto.h
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/queue.c → lib/TasmotaMqtt-1.1.1/src/mqtt/queue.c b/lib/TasmotaMqtt-1.1.0/src/mqtt/queue.c → lib/TasmotaMqtt-1.1.1/src/mqtt/queue.c
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/queue.h → lib/TasmotaMqtt-1.1.1/src/mqtt/queue.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/queue.h → lib/TasmotaMqtt-1.1.1/src/mqtt/queue.h
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.c → lib/TasmotaMqtt-1.1.1/src/mqtt/ringbuf.c b/lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.c → lib/TasmotaMqtt-1.1.1/src/mqtt/ringbuf.c
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.h → lib/TasmotaMqtt-1.1.1/src/mqtt/ringbuf.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.h → lib/TasmotaMqtt-1.1.1/src/mqtt/ringbuf.h
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/typedef.h → lib/TasmotaMqtt-1.1.1/src/mqtt/typedef.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/typedef.h → lib/TasmotaMqtt-1.1.1/src/mqtt/typedef.h
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/user_config.h → lib/TasmotaMqtt-1.1.1/src/mqtt/user_config.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/user_config.h → lib/TasmotaMqtt-1.1.1/src/mqtt/user_config.h
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/utils.c → lib/TasmotaMqtt-1.1.1/src/mqtt/utils.c b/lib/TasmotaMqtt-1.1.0/src/mqtt/utils.c → lib/TasmotaMqtt-1.1.1/src/mqtt/utils.c
diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/utils.h → lib/TasmotaMqtt-1.1.1/src/mqtt/utils.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/utils.h → lib/TasmotaMqtt-1.1.1/src/mqtt/utils.h
diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino
@@ -154,12 +154,14 @@ void MqttDisconnectedCb()
   MqttDisconnected(MqttClient->getState());  // status codes are documented in file mqtt.h as tConnState
 }
 
-void MqttMyDataCb(const char* topic, uint32_t topic_len, const char *data, uint32_t data_len)
+void MqttMyDataCb(const char* topic, uint32_t topic_len, const char* data, uint32_t data_len)
 {
-	char topicCpy[topic_len];
-	memcpy(topicCpy, topic, topic_len);
-	topicCpy[topic_len] = 0;
-  MqttDataHandler((char*)topicCpy, (byte*)data, data_len);
+	char topic_copy[topic_len +1];
+
+	memcpy(topic_copy, topic, topic_len);
+	topic_copy[topic_len] = 0;
+  if (0 == data_len) data = (const char*)&topic_copy + topic_len;
+  MqttDataHandler((char*)topic_copy, (byte*)data, data_len);
 }
 
 void MqttSubscribeLib(char *topic)