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

Fix payload length verification (#680)

Browse Source
This commit is contained in:
Olivier
2016-12-06 15:45:27 +01:00
committed by Patrick Fallberg
parent f59be0aa2a
commit fdbb285dee
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/MyTransport.cpp
+6 -1
View File
@@ -554,11 +554,16 @@ void transportProcessMessage(void) {
(void)signerCheckTimer();
// receive message
setIndication(INDICATION_RX);
const uint8_t payloadLength = transportReceive((uint8_t *)&_msg);
uint8_t payloadLength = transportReceive((uint8_t *)&_msg);
// get message length and limit size
const uint8_t msgLength = min(mGetLength(_msg), (uint8_t)MAX_PAYLOAD);
// calculate expected length
const uint8_t expectedMessageLength = HEADER_SIZE + (mGetSigned(_msg) ? MAX_PAYLOAD : msgLength);
#if defined(MY_RF24_ENABLE_ENCRYPTION)
// payload length = a multiple of blocksize length for decrypted messages, i.e. cannot be used for payload length check
payloadLength = expectedMessageLength;
#endif
const uint8_t command = mGetCommand(_msg);
const uint8_t type = _msg.type;
const uint8_t sender = _msg.sender;