add header validation to decompressFile

StillGreen-san · Jul 15, 2023 · 270d761 · 270d761
1 parent c821771
commit 270d761
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/inc/savefile.hpp b/inc/savefile.hpp
@@ -165,6 +165,8 @@ class SaveFile
 	 */
 	SaveFile(std::vector<uint8_t> data);
 
+	static bool isValid(Header header);
+
 private:
 	std::vector<uint8_t> dataBuffer;
 };

diff --git a/src/app.cpp b/src/app.cpp
@@ -82,6 +82,11 @@ SaveFile App::decompressFile(const void* compressedData, uint32_t size)
 	}
 
 	const auto* inputHeader = static_cast<const SaveFile::Header*>(compressedData);
+	if(!SaveFile::isValid(*inputHeader))
+	{
+		return {0, 0};
+	}
+
 	std::vector<uint8_t> decompressedData(HeaderSize + inputHeader->userProp3, 0);
 	new(decompressedData.data()) SaveFile::Header{*inputHeader};
 

diff --git a/src/savefile.cpp b/src/savefile.cpp
@@ -66,10 +66,13 @@ SaveFile::SaveFile(uint32_t chunks, uint32_t totalBytes)
 }
 SaveFile::SaveFile(std::vector<uint8_t> data) : dataBuffer{std::move(data)}
 {
-	if(dataBuffer.size() < sizeof(Header) || header().magic != SaveFile::magic || header().formatVersion != 2 ||
-	    header()._reserved_ != 0)
+	if(dataBuffer.size() < sizeof(Header) || !SaveFile::isValid(header()))
 	{
 		reset(0, 0);
 	}
 }
+bool SaveFile::isValid(SaveFile::Header header)
+{
+	return header.magic == SaveFile::magic && header.formatVersion == 2 && header._reserved_ == 0;
+}
 } // namespace raymino