From 75af7655deefae50f1787f607a81ca382a05dc9d Mon Sep 17 00:00:00 2001
From: athatheocsd <athatheo@csd.auth.gr>
Date: Thu, 10 Jan 2019 04:42:05 +0200
Subject: [PATCH] Final change hopefully :P
---
src/Services/EventActionService.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Services/EventActionService.cpp b/src/Services/EventActionService.cpp
index 5938837c..7446ed78 100644
--- a/src/Services/EventActionService.cpp
+++ b/src/Services/EventActionService.cpp
@@ -25,11 +25,12 @@ void EventActionService::addEventActionDefinitions(Message message) {
eventActionDefinitionArray[index].eventDefinitionID = message.readEnum16();
// Tests pass with message.dataSize - 3, message.dataSize - 4, but not
// message.dataSize - 5
- if (message.dataSize - 4 > ECSS_EVENT_SERVICE_STRING_SIZE) { // Should this be >= ?
+ if (message.dataSize - 4 > ECSS_EVENT_SERVICE_STRING_SIZE) { // TODO: Fix this
ErrorHandler::reportInternalError(ErrorHandler::InternalErrorType::MessageTooLarge);
} else {
char data[ECSS_EVENT_SERVICE_STRING_SIZE];
- message.readString(data, message.dataSize);
+ std::cout << message.dataSize;
+ message.readString(data, message.dataSize - 4);
eventActionDefinitionArray[index].request = String<ECSS_EVENT_SERVICE_STRING_SIZE>(
data);
}
--
GitLab