Merge pull request #177 from RagnarokResearchLab/decoder-sanity-checks

Add a missing EOF sanity check to the SPR and GND decoders
RagnarokResearchLab · Nov 12, 2023 · 106302f · 106302f
2 parents 4d0db2d + 1ee2dd3
commit 106302f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/Core/FileFormats/RagnarokGND.lua b/Core/FileFormats/RagnarokGND.lua
@@ -111,6 +111,10 @@ function RagnarokGND:DecodeFileContents(fileContents)
 	self:DecodeCubeGrid()
 	self:DecodeWaterPlanes()
 
+	local numBytesRemaining = self.reader.endOfFilePointer - self.reader.virtualFilePointer
+	local eofErrorMessage = format("Detected %s leftover bytes at the end of the structure!", numBytesRemaining)
+	assert(self.reader:HasReachedEOF(), eofErrorMessage)
+
 	local endTime = uv.hrtime()
 	local decodingTimeInMilliseconds = (endTime - startTime) / 10E5
 	printf("[RagnarokGND] Finished decoding file contents in %.2f ms", decodingTimeInMilliseconds)

diff --git a/Core/FileFormats/RagnarokSPR.lua b/Core/FileFormats/RagnarokSPR.lua
@@ -41,6 +41,10 @@ function RagnarokSPR:DecodeFileContents(fileContents)
 	self:DecodeTrueColorImages()
 	self:DecodeColorPalette()
 
+	local numBytesRemaining = self.reader.endOfFilePointer - self.reader.virtualFilePointer
+	local eofErrorMessage = format("Detected %s leftover bytes at the end of the structure!", numBytesRemaining)
+	assert(self.reader:HasReachedEOF(), eofErrorMessage)
+
 	local endTime = uv_hrtime()
 	local decodingTimeInMilliseconds = (endTime - startTime) / 10E5
 	printf("[RagnarokSPR] Finished decoding file contents in %.2f ms", decodingTimeInMilliseconds)