From 444ee80f356a8e6b8e639c1cb847da320a21713b Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Fri, 10 Jul 2020 20:31:10 +0200
Subject: [PATCH] removed unnecessary case and added more size checks

---
 pus/Service2DeviceAccess.cpp |  6 ++----
 tmtcservices/PusParser.cpp   | 29 ++++++++++++++---------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/pus/Service2DeviceAccess.cpp b/pus/Service2DeviceAccess.cpp
index 1d5f21eb..84d6693d 100644
--- a/pus/Service2DeviceAccess.cpp
+++ b/pus/Service2DeviceAccess.cpp
@@ -60,13 +60,11 @@ ReturnValue_t Service2DeviceAccess::prepareCommand(CommandMessage* message,
 		uint32_t* state, object_id_t objectId) {
 	switch(static_cast<Subservice>(subservice)){
 	case Subservice::RAW_COMMANDING: {
-		return prepareRawCommand(dynamic_cast<CommandMessage*>(message),
-				tcData, tcDataLen);
+		return prepareRawCommand(message, tcData, tcDataLen);
 	}
 	break;
 	case Subservice::TOGGLE_WIRETAPPING: {
-		return prepareWiretappingCommand(dynamic_cast<CommandMessage*>(message),
-				tcData, tcDataLen);
+		return prepareWiretappingCommand(message, tcData, tcDataLen);
 	}
 	break;
 	default:
diff --git a/tmtcservices/PusParser.cpp b/tmtcservices/PusParser.cpp
index 4198e36e..3dd34a84 100644
--- a/tmtcservices/PusParser.cpp
+++ b/tmtcservices/PusParser.cpp
@@ -7,9 +7,8 @@ PusParser::PusParser(uint16_t maxExpectedPusPackets,
 
 ReturnValue_t PusParser::parsePusPackets(const uint8_t *frame,
 		size_t frameSize) {
-	if(frame == nullptr) {
-		sif::error << "PusParser::parsePusPackets: Frame pointers in invalid!"
-				<< std::endl;
+	if(frame == nullptr or frameSize < 5) {
+		sif::error << "PusParser::parsePusPackets: Frame invalid!" << std::endl;
 		return HasReturnvaluesIF::RETURN_FAILED;
 	}
 
@@ -25,15 +24,13 @@ ReturnValue_t PusParser::parsePusPackets(const uint8_t *frame,
 	}
 
 	size_t packetSize = lengthField + 7;
+	// sif::debug << frameSize << std::endl;
 	// Size of a pus packet is the value in the packet length field plus 7.
-	if(packetSize > frameSize)
-	{
-		if(storeSplitPackets)
-		{
+	if(packetSize > frameSize) {
+		if(storeSplitPackets) {
 			indexSizePairFIFO.insert(indexSizePair(0, frameSize));
 		}
-		else
-		{
+		else {
 			sif::debug << "TcSerialPollingTask::readNextPacket: Next packet "
 					"larger than remaining frame," << std::endl;
 			sif::debug << "Throwing away packet. Detected packet size: "
@@ -41,8 +38,7 @@ ReturnValue_t PusParser::parsePusPackets(const uint8_t *frame,
 		}
 		return SPLIT_PACKET;
 	}
-	else
-	{
+	else {
 		indexSizePairFIFO.insert(indexSizePair(0, packetSize));
 		if(packetSize == frameSize) {
 			return HasReturnvaluesIF::RETURN_OK;
@@ -77,6 +73,11 @@ PusParser::indexSizePair PusParser::getNextFifoPair() {
 ReturnValue_t PusParser::readNextPacket(const uint8_t *frame,
 		size_t frameSize, size_t& currentIndex) {
 	// sif::debug << startIndex << std::endl;
+    if(currentIndex + 5 > frameSize) {
+        currentIndex = frameSize;
+        return HasReturnvaluesIF::RETURN_OK;
+    }
+
 	uint16_t lengthField = frame[currentIndex + 4] << 8 |
 			frame[currentIndex + 5];
 	if(lengthField == 0) {
@@ -88,12 +89,10 @@ ReturnValue_t PusParser::readNextPacket(const uint8_t *frame,
 	size_t remainingSize = frameSize - currentIndex;
 	if(nextPacketSize > remainingSize)
 	{
-		if(storeSplitPackets)
-		{
+		if(storeSplitPackets) {
 			indexSizePairFIFO.insert(indexSizePair(currentIndex, remainingSize));
 		}
-		else
-		{
+		else {
 			sif::debug << "TcSerialPollingTask::readNextPacket: Next packet "
 					"larger than remaining frame," << std::endl;
 			sif::debug << "Throwing away packet. Detected packet size: "