Merge development branch

2016-10-01 14:04:33 +02:00
parent f148a9940b 2e4f74f8e2
commit a31eff112e
53 changed files with 8007 additions and 214 deletions
@@ -583,6 +583,8 @@ void transportProcessMessage(void) {
 		
 	// Is message addressed to this node?
 	if (destination == _nc.nodeId) {
+		// prevent buffer overflow by limiting max. possible message length (5 bits=31 bytes max) to MAX_PAYLOAD (25 bytes)
+		mSetLength(_msg, min(mGetLength(_msg),(uint8_t)MAX_PAYLOAD));
 		// null terminate data
 		_msg.data[msgLength] = 0u;
 		// Check if sender requests an ack back.