From 2f8020baacf8c146271b549bae48e275eb45507b Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 9 Aug 2022 11:03:22 +0200
Subject: [PATCH] move parsing steps into parse function

---
 src/fsfw/cfdp/pdu/HeaderReader.cpp   | 8 ++++++--
 unittests/cfdp/testCfdpHeader.cpp    | 4 ++--
 unittests/cfdp/testFileDirective.cpp | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/fsfw/cfdp/pdu/HeaderReader.cpp b/src/fsfw/cfdp/pdu/HeaderReader.cpp
index 06a403476..1fd40b78a 100644
--- a/src/fsfw/cfdp/pdu/HeaderReader.cpp
+++ b/src/fsfw/cfdp/pdu/HeaderReader.cpp
@@ -7,12 +7,14 @@
 HeaderReader::HeaderReader(const uint8_t *pduBuf, size_t maxSize) { setData(pduBuf, maxSize); }
 
 ReturnValue_t HeaderReader::parseData() {
-  if (isNull()) {
+  if (pointers.rawPtr == nullptr) {
     return HasReturnvaluesIF::RETURN_FAILED;
   }
   if (maxSize < 7) {
     return SerializeIF::STREAM_TOO_SHORT;
   }
+  pointers.fixedHeader =
+      reinterpret_cast<PduHeaderFixedStruct *>(const_cast<uint8_t *>(pointers.rawPtr));
   sourceIdRaw = static_cast<uint8_t *>(&pointers.fixedHeader->variableFieldsStart);
   cfdp::WidthInBytes widthEntityIds = getLenEntityIds();
   cfdp::WidthInBytes widthSeqNum = getLenSeqNum();
@@ -22,11 +24,13 @@ ReturnValue_t HeaderReader::parseData() {
 }
 
 ReturnValue_t HeaderReader::setData(uint8_t *dataPtr, size_t maxSize_, void *args) {
+  if (dataPtr == nullptr) {
+    return HasReturnvaluesIF::RETURN_FAILED;
+  }
   if (maxSize_ < 7) {
     return SerializeIF::STREAM_TOO_SHORT;
   }
   pointers.rawPtr = dataPtr;
-  pointers.fixedHeader = reinterpret_cast<PduHeaderFixedStruct *>(const_cast<uint8_t *>(dataPtr));
   maxSize = maxSize_;
   return HasReturnvaluesIF::RETURN_OK;
 }
diff --git a/unittests/cfdp/testCfdpHeader.cpp b/unittests/cfdp/testCfdpHeader.cpp
index 6453b8093..0b131669b 100644
--- a/unittests/cfdp/testCfdpHeader.cpp
+++ b/unittests/cfdp/testCfdpHeader.cpp
@@ -268,8 +268,8 @@ TEST_CASE("CFDP Header", "[cfdp]") {
     result = headerDeser.parseData();
     REQUIRE(result == result::OK);
 
-    headerDeser.setData(nullptr, -1);
-    REQUIRE(headerDeser.getHeaderSize() == 0);
+    CHECK(headerDeser.setData(nullptr, -1) != result::OK);
+    REQUIRE(headerDeser.getHeaderSize() == 14);
     headerDeser.setData(serBuf.data(), serBuf.size());
 
     serTarget = serBuf.data();
diff --git a/unittests/cfdp/testFileDirective.cpp b/unittests/cfdp/testFileDirective.cpp
index d7c35456b..b694cd682 100644
--- a/unittests/cfdp/testFileDirective.cpp
+++ b/unittests/cfdp/testFileDirective.cpp
@@ -64,13 +64,15 @@ TEST_CASE("CFDP File Directive", "[cfdp]") {
     deserTarget = serBuf.data();
     CHECK(serSize == 8);
     auto fdDeser = FileDirectiveReader(deserTarget, serBuf.size());
-    REQUIRE(not fdDeser.isNull());
-    REQUIRE(fdDeser);
+    REQUIRE(fdDeser.isNull());
+    REQUIRE(not fdDeser);
     REQUIRE(fdDeser.getEndianness() == SerializeIF::Endianness::NETWORK);
     fdDeser.setEndianness(SerializeIF::Endianness::MACHINE);
     REQUIRE(fdDeser.getEndianness() == SerializeIF::Endianness::MACHINE);
     fdDeser.setEndianness(SerializeIF::Endianness::NETWORK);
     REQUIRE(fdDeser.parseData() == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(not fdDeser.isNull());
+    REQUIRE(fdDeser);
     REQUIRE(fdDeser.getFileDirective() == FileDirectives::ACK);
     REQUIRE(fdDeser.getPduDataFieldLen() == 5);
     REQUIRE(fdDeser.getHeaderSize() == 8);