MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #106 from mapnull/fix_buf_check

Browse Source 
fix check for NULL buffer in getString()
This commit is contained in:
Henrik Ekblad
2015-05-04 21:58:51 +02:00
parent b0737a7311 1acee7b988
commit e79340a345
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/MyMessage.cpp
+5 -6
View File
@@ -61,12 +61,11 @@ char* MyMessage::getStream(char *buffer) const {
char* MyMessage::getString(char *buffer) const { char* MyMessage::getString(char *buffer) const {
uint8_t payloadType = miGetPayloadType(); uint8_t payloadType = miGetPayloadType();
if (payloadType == P_STRING) { if (buffer != NULL) {
strncpy(buffer, data, miGetLength()); if (payloadType == P_STRING) {
buffer[miGetLength()] = 0; strncpy(buffer, data, miGetLength());
return buffer; buffer[miGetLength()] = 0;
} else if (buffer != NULL) { } else if (payloadType == P_BYTE) {
if (payloadType == P_BYTE) {
itoa(bValue, buffer, 10); itoa(bValue, buffer, 10);
} else if (payloadType == P_INT16) { } else if (payloadType == P_INT16) {
itoa(iValue, buffer, 10); itoa(iValue, buffer, 10);