Skip to content

Commit e79340a

Browse files
committed
Merge pull request arduino#106 from mapnull/fix_buf_check
fix check for NULL buffer in getString()
2 parents b0737a7 + 1acee7b commit e79340a

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

libraries/MySensors/MyMessage.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,11 @@ char* MyMessage::getStream(char *buffer) const {
6161

6262
char* MyMessage::getString(char *buffer) const {
6363
uint8_t payloadType = miGetPayloadType();
64-
if (payloadType == P_STRING) {
65-
strncpy(buffer, data, miGetLength());
66-
buffer[miGetLength()] = 0;
67-
return buffer;
68-
} else if (buffer != NULL) {
69-
if (payloadType == P_BYTE) {
64+
if (buffer != NULL) {
65+
if (payloadType == P_STRING) {
66+
strncpy(buffer, data, miGetLength());
67+
buffer[miGetLength()] = 0;
68+
} else if (payloadType == P_BYTE) {
7069
itoa(bValue, buffer, 10);
7170
} else if (payloadType == P_INT16) {
7271
itoa(iValue, buffer, 10);

0 commit comments

Comments
 (0)