Fixed some logic responsible to handle too short PFS0 header sizes

seiya-dev · Jan 1, 2024 · 56c01ac · 56c01ac
1 parent ec580d7
commit 56c01ac
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/py/nstools/Fs/Pfs0.py b/py/nstools/Fs/Pfs0.py
@@ -77,8 +77,8 @@ def getStringTableSize(self):
 		stringTableSizePadded = len(stringTableNonPadded) + self.allign0x20(headerSizeNonPadded)
 		if self._stringTableSize == None:
 			self._stringTableSize = stringTableSizePadded
-		if stringTableSizePadded > self._stringTableSize:
-			self._stringTableSize = stringTableSizePadded
+		elif len(stringTableNonPadded) > self._stringTableSize:
+			self._stringTableSize = len(stringTableNonPadded)
 		return self._stringTableSize
 
 	def getFirstFileOffset(self):
@@ -156,8 +156,8 @@ def getStringTableSize(self):
 		stringTableSizePadded = len(stringTableNonPadded) + self.allign0x20(headerSizeNonPadded)
 		if self._stringTableSize == None:
 			self._stringTableSize = stringTableSizePadded
-		if stringTableSizePadded > self._stringTableSize:
-			self._stringTableSize = stringTableSizePadded
+		elif len(stringTableNonPadded) > self._stringTableSize:
+			self._stringTableSize = len(stringTableNonPadded)
 		return self._stringTableSize
 
 	def getHash(self):
@@ -173,7 +173,7 @@ def getHeaderHash(self):
 		h = b''
 		h += b'PFS0'
 		h += len(self.files).to_bytes(4, byteorder='little')
-		h += (self.getStringTableSize()).to_bytes(4, byteorder='little')
+		h += (stringTableSizePadded).to_bytes(4, byteorder='little')
 		h += b'\x00\x00\x00\x00'
 
 		stringOffset = 0