From 42a0b153031e90191fb11606c23a51a6c3576aaf Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 6 Sep 2023 20:49:53 +0200 Subject: [PATCH] hardcore bug --- src/fsfw/cfdp/handler/SourceHandler.cpp | 1 + src/fsfw/storagemanager/LocalPool.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fsfw/cfdp/handler/SourceHandler.cpp b/src/fsfw/cfdp/handler/SourceHandler.cpp index 60a947e3..141afcef 100644 --- a/src/fsfw/cfdp/handler/SourceHandler.cpp +++ b/src/fsfw/cfdp/handler/SourceHandler.cpp @@ -371,5 +371,6 @@ void cfdp::SourceHandler::addError(ReturnValue_t error) { if (fsmResult.errors < fsmResult.errorCodes.size()) { fsmResult.errorCodes[fsmResult.errors] = error; fsmResult.errors++; + fsmResult.result = error; } } diff --git a/src/fsfw/storagemanager/LocalPool.cpp b/src/fsfw/storagemanager/LocalPool.cpp index b62c19b6..9a4b53a6 100644 --- a/src/fsfw/storagemanager/LocalPool.cpp +++ b/src/fsfw/storagemanager/LocalPool.cpp @@ -89,7 +89,7 @@ ReturnValue_t LocalPool::deleteData(store_address_t storeId) { ReturnValue_t status = returnvalue::OK; size_type pageSize = getSubpoolElementSize(storeId.poolIndex); if ((pageSize != 0) and (storeId.packetIndex < numberOfElements[storeId.poolIndex])) { - uint16_t packetPosition = getRawPosition(storeId); + size_type packetPosition = getRawPosition(storeId); uint8_t* ptr = &store[storeId.poolIndex][packetPosition]; std::memset(ptr, 0, pageSize); // Set free list