From 6d53a38f9ff7de4c0086f0da0acf68bd4fe78d86 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 24 Aug 2022 15:16:46 +0200 Subject: [PATCH] small update --- linux/devices/ploc/PlocSupervisorHandler.cpp | 12 ++++++++---- linux/devices/ploc/PlocSupvHelper.cpp | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/linux/devices/ploc/PlocSupervisorHandler.cpp b/linux/devices/ploc/PlocSupervisorHandler.cpp index a5d3f3e2..040fa1de 100644 --- a/linux/devices/ploc/PlocSupervisorHandler.cpp +++ b/linux/devices/ploc/PlocSupervisorHandler.cpp @@ -1994,7 +1994,8 @@ ReturnValue_t PlocSupervisorHandler::extractUpdateCommand(const uint8_t* command supv::UpdateParams& params) { size_t remSize = size; if (size > (config::MAX_FILENAME_SIZE + config::MAX_PATH_SIZE + sizeof(params.memId)) + - sizeof(params.startAddr) + sizeof(params.bytesWritten) + sizeof(params.seqCount)) { + sizeof(params.startAddr) + sizeof(params.bytesWritten) + sizeof(params.seqCount) + + sizeof(uint8_t)) { sif::warning << "PlocSupervisorHandler::extractUpdateCommand: Data size too big" << std::endl; return SupvReturnValuesIF::INVALID_LENGTH; } @@ -2016,14 +2017,17 @@ ReturnValue_t PlocSupervisorHandler::extractUpdateCommand(const uint8_t* command << std::endl; return result; } - result = SerializeAdapter::deSerialize(¶ms.deleteMemory, &commandData, &remSize, - SerializeIF::Endianness::BIG); + uint8_t delMemRaw = 0; + result = SerializeAdapter::deSerialize(&delMemRaw, &commandData, &remSize, + SerializeIF::Endianness::BIG); if (result != RETURN_OK) { sif::warning << "PlocSupervisorHandler::extractUpdateCommand: Failed to deserialize whether to delete " - "memory" << std::endl; + "memory" + << std::endl; return result; } + params.deleteMemory = delMemRaw; return RETURN_OK; } diff --git a/linux/devices/ploc/PlocSupvHelper.cpp b/linux/devices/ploc/PlocSupvHelper.cpp index a33765b5..c6641f6e 100644 --- a/linux/devices/ploc/PlocSupvHelper.cpp +++ b/linux/devices/ploc/PlocSupvHelper.cpp @@ -253,7 +253,7 @@ ReturnValue_t PlocSupvHelper::executeUpdate() { if (result != RETURN_OK) { return result; } - if(update.deleteMemory) { + if (update.deleteMemory) { sif::info << "PLOC SUPV Update MPSoC: Erasing Memory" << std::endl; result = eraseMemory(); if (result != RETURN_OK) {