From 745c6703c8289df5f5e5737363a7240564176595 Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Thu, 20 May 2021 18:54:33 -0400
Subject: [PATCH] switch these checks around so they are run in all cases

---
 psoutils/src/packets/quest.rs | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/psoutils/src/packets/quest.rs b/psoutils/src/packets/quest.rs
index d487b8e..38cdcf1 100644
--- a/psoutils/src/packets/quest.rs
+++ b/psoutils/src/packets/quest.rs
@@ -94,14 +94,6 @@ impl QuestHeaderPacket {
         Self: Sized,
     {
         let header = PacketHeader::from_bytes(reader)?;
-        if header.id != PACKET_ID_QUEST_HEADER_ONLINE && header.id != PACKET_ID_QUEST_HEADER_OFFLINE
-        {
-            return Err(PacketError::WrongId(header.id));
-        }
-        if header.size != Self::packet_size() as u16 {
-            return Err(PacketError::WrongSize(header.size));
-        }
-
         Self::from_header_and_bytes(header, reader)
     }
 
@@ -112,6 +104,14 @@ impl QuestHeaderPacket {
     where
         Self: Sized,
     {
+        if header.id != PACKET_ID_QUEST_HEADER_ONLINE && header.id != PACKET_ID_QUEST_HEADER_OFFLINE
+        {
+            return Err(PacketError::WrongId(header.id));
+        }
+        if header.size != Self::packet_size() as u16 {
+            return Err(PacketError::WrongSize(header.size));
+        }
+
         let name: [u8; QUEST_HEADER_NAME_SIZE] = reader.read_bytes()?;
         let unused = reader.read_u16::<LittleEndian>()?;
         let flags = reader.read_u16::<LittleEndian>()?;
@@ -214,13 +214,6 @@ impl QuestDataPacket {
         Self: Sized,
     {
         let header = PacketHeader::from_bytes(reader)?;
-        if header.id != PACKET_ID_QUEST_DATA_ONLINE && header.id != PACKET_ID_QUEST_DATA_OFFLINE {
-            return Err(PacketError::WrongId(header.id));
-        }
-        if header.size != Self::packet_size() as u16 {
-            return Err(PacketError::WrongSize(header.size));
-        }
-
         Self::from_header_and_bytes(header, reader)
     }
 
@@ -231,6 +224,13 @@ impl QuestDataPacket {
     where
         Self: Sized,
     {
+        if header.id != PACKET_ID_QUEST_DATA_ONLINE && header.id != PACKET_ID_QUEST_DATA_OFFLINE {
+            return Err(PacketError::WrongId(header.id));
+        }
+        if header.size != Self::packet_size() as u16 {
+            return Err(PacketError::WrongSize(header.size));
+        }
+
         let filename: [u8; QUEST_HEADER_FILENAME_SIZE] = reader.read_bytes()?;
         let data: [u8; QUEST_DATA_PACKET_DATA_SIZE] = reader.read_bytes()?;
         let size = reader.read_u32::<LittleEndian>()?;