From 94348cec1ad8976e203ddb6d49484281e60e6116 Mon Sep 17 00:00:00 2001 From: tekka007 Date: Wed, 10 Aug 2016 12:08:44 +0200 Subject: [PATCH] Limit payload size to MAX_PAYLOAD_SIZE --- core/MyMessage.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/MyMessage.cpp b/core/MyMessage.cpp index 1f330de..a0ee9d0 100644 --- a/core/MyMessage.cpp +++ b/core/MyMessage.cpp @@ -210,9 +210,10 @@ MyMessage& MyMessage::setDestination(uint8_t _destination) { // Set payload MyMessage& MyMessage::set(void* value, uint8_t length) { + uint8_t payloadLength = value == NULL ? 0 : min(length, MAX_PAYLOAD); + miSetLength(payloadLength); miSetPayloadType(P_CUSTOM); - miSetLength(length); - memcpy(data, value, min(length, MAX_PAYLOAD)); + memcpy(data, value, payloadLength); return *this; }