From 1acee7b988c744747f78328f16362cd0a45815f6 Mon Sep 17 00:00:00 2001 From: Marcelo Aquino Date: Mon, 4 May 2015 16:18:32 -0300 Subject: [PATCH 1/2] fix check for NULL buffer in getString() --- libraries/MySensors/MyMessage.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libraries/MySensors/MyMessage.cpp b/libraries/MySensors/MyMessage.cpp index 7143e9c..782ac70 100755 --- a/libraries/MySensors/MyMessage.cpp +++ b/libraries/MySensors/MyMessage.cpp @@ -61,12 +61,11 @@ char* MyMessage::getStream(char *buffer) const { char* MyMessage::getString(char *buffer) const { uint8_t payloadType = miGetPayloadType(); - if (payloadType == P_STRING) { - strncpy(buffer, data, miGetLength()); - buffer[miGetLength()] = 0; - return buffer; - } else if (buffer != NULL) { - if (payloadType == P_BYTE) { + if (buffer != NULL) { + if (payloadType == P_STRING) { + strncpy(buffer, data, miGetLength()); + buffer[miGetLength()] = 0; + } else if (payloadType == P_BYTE) { itoa(bValue, buffer, 10); } else if (payloadType == P_INT16) { itoa(iValue, buffer, 10); From fe04c2789ec1dd0cc7fd38673bba74b58f385912 Mon Sep 17 00:00:00 2001 From: Henrik Ekblad Date: Mon, 4 May 2015 22:56:52 +0200 Subject: [PATCH 2/2] Rename example sketch --- .../MysensorMicro.ino => SensebenderMicro/SensebenderMicro.ino} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename libraries/MySensors/examples/{MysensorMicro/MysensorMicro.ino => SensebenderMicro/SensebenderMicro.ino} (100%) diff --git a/libraries/MySensors/examples/MysensorMicro/MysensorMicro.ino b/libraries/MySensors/examples/SensebenderMicro/SensebenderMicro.ino similarity index 100% rename from libraries/MySensors/examples/MysensorMicro/MysensorMicro.ino rename to libraries/MySensors/examples/SensebenderMicro/SensebenderMicro.ino