Merge pull request #273 from mysensors/null-check-fix

fallberg · fallberg · commit 654e804744c3 · 2015-11-30T07:24:57.000+01:00
diff --git a/libraries/MySensors/core/MyMessage.cpp b/libraries/MySensors/core/MyMessage.cpp
@@ -200,10 +200,13 @@ MyMessage& MyMessage::set(void* value, uint8_t length) {
 }
 
 MyMessage& MyMessage::set(const char* value) {
-	uint8_t length = min(strlen(value), MAX_PAYLOAD);
+	uint8_t length = value == NULL ? 0 : min(strlen(value), MAX_PAYLOAD);
 	miSetLength(length);
 	miSetPayloadType(P_STRING);
-	strncpy(data, value, length);
+	if (length)
+		strncpy(data, value, length);
+	else
+		data[0] ='\0';
 	return *this;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -200,10 +200,13 @@ MyMessage& MyMessage::set(void* value, uint8_t length) {`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`MyMessage& MyMessage::set(const char* value) {`
`203`		`- uint8_t length = min(strlen(value), MAX_PAYLOAD);`
	`203`	`+ uint8_t length = value == NULL ? 0 : min(strlen(value), MAX_PAYLOAD);`
`204`	`204`	`miSetLength(length);`
`205`	`205`	`miSetPayloadType(P_STRING);`
`206`		`- strncpy(data, value, length);`
	`206`	`+ if (length)`
	`207`	`+ strncpy(data, value, length);`
	`208`	`+ else`
	`209`	`+ data[0] ='\0';`
`207`	`210`	`return *this;`
`208`	`211`	`}`
`209`	`212`