From 0c25cee86a28a52f7311cae06968398077cd75ed Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Sun, 8 Jan 2023 19:59:23 +0100
Subject: [PATCH] Modify checks in Akashis packet creation

---
 core/src/packet/packet_factory.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/src/packet/packet_factory.cpp b/core/src/packet/packet_factory.cpp
index cf2f098..4584d6a 100644
--- a/core/src/packet/packet_factory.cpp
+++ b/core/src/packet/packet_factory.cpp
@@ -15,16 +15,23 @@ AOPacket *PacketFactory::createPacket(QString raw_packet)
     QString header;
     QStringList contents;
 
-    if (raw_packet.at(0) == '#' || raw_packet.contains("%") || raw_packet.isEmpty()) {
+    if (raw_packet.isEmpty()) {
+        qDebug() << "Empty packet received.";
+        return PacketFactory::createPacket("Unknown", {"Unknown"});
+    }
+
+    if (raw_packet.at(0) == '#' || raw_packet.contains("%")) {
         qDebug() << "FantaCrypt or otherwise invalid packet received";
         return PacketFactory::createPacket("Unknown", {"Unknown"});
     }
 
     QStringList packet_contents = raw_packet.split("#");
     header = packet_contents[0];
-
     packet_contents.removeFirst(); // Remove header
-    packet_contents.removeLast();  // Remove anything trailing after delimiter
+
+    if (!packet_contents.isEmpty()) {
+        packet_contents.removeLast(); // Remove anything trailing after delimiter
+    }
     contents = packet_contents;
 
     AOPacket *packet = PacketFactory::createPacket(header, contents);