SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-09-22 14:55:11 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Ensure endianness of reads

Browse Source
This commit is contained in:
Matt Nadareski
2025-07-31 09:41:36 -04:00
parent 544637779c
commit f07b7a049e
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SabreTools.Serialization/Deserializers/SecuROMDFA.cs
View File

@@ -29,7 +29,7 @@ namespace SabreTools.Serialization.Deserializers
if (!dfa.Signature.EqualsExactly(DFAMagicBytes))
return null;
dfa.BlockOrHeaderSize = data.ReadUInt32();
dfa.BlockOrHeaderSize = data.ReadUInt32LittleEndian();
#endregion
@@ -70,7 +70,7 @@ namespace SabreTools.Serialization.Deserializers
byte[] name = data.ReadBytes(4);
obj.Name = Encoding.ASCII.GetString(name);
obj.Length = data.ReadUInt32();
obj.Length = data.ReadUInt32LittleEndian();
if (obj.Length > 0)
obj.Value = data.ReadBytes((int)obj.Length);

24
SabreTools.Serialization/Wrappers/Nitro.cs
View File

@@ -151,8 +151,8 @@ namespace SabreTools.Serialization.Wrappers
int readOffset = 0;
// Grab the first two blocks
uint p0 = SecureArea.ReadUInt32(ref readOffset);
uint p1 = SecureArea.ReadUInt32(ref readOffset);
uint p0 = SecureArea.ReadUInt32LittleEndian(ref readOffset);
uint p1 = SecureArea.ReadUInt32LittleEndian(ref readOffset);
// Perform the initialization steps
Init1(tableData);
@@ -168,8 +168,8 @@ namespace SabreTools.Serialization.Wrappers
uint size = 0x800 - 8;
while (size > 0)
{
p0 = SecureArea.ReadUInt32(ref readOffset);
p1 = SecureArea.ReadUInt32(ref readOffset);
p0 = SecureArea.ReadUInt32LittleEndian(ref readOffset);
p1 = SecureArea.ReadUInt32LittleEndian(ref readOffset);
Encrypt(ref p1, ref p0);
@@ -183,8 +183,8 @@ namespace SabreTools.Serialization.Wrappers
readOffset = 0;
writeOffset = 0;
p0 = SecureArea.ReadUInt32(ref readOffset);
p1 = SecureArea.ReadUInt32(ref readOffset);
p0 = SecureArea.ReadUInt32LittleEndian(ref readOffset);
p1 = SecureArea.ReadUInt32LittleEndian(ref readOffset);
if (p0 == 0xE7FFDEFF && p1 == 0xE7FFDEFF)
{
@@ -274,8 +274,8 @@ namespace SabreTools.Serialization.Wrappers
int writeOffset = 0;
// Grab the first two blocks
uint p0 = SecureArea.ReadUInt32(ref readOffset);
uint p1 = SecureArea.ReadUInt32(ref readOffset);
uint p0 = SecureArea.ReadUInt32LittleEndian(ref readOffset);
uint p1 = SecureArea.ReadUInt32LittleEndian(ref readOffset);
// Perform the initialization steps
Init1(tableData);
@@ -303,8 +303,8 @@ namespace SabreTools.Serialization.Wrappers
uint size = 0x800 - 8;
while (size > 0)
{
p0 = SecureArea.ReadUInt32(ref readOffset);
p1 = SecureArea.ReadUInt32(ref readOffset);
p0 = SecureArea.ReadUInt32LittleEndian(ref readOffset);
p1 = SecureArea.ReadUInt32LittleEndian(ref readOffset);
Decrypt(ref p1, ref p0);
@@ -354,8 +354,8 @@ namespace SabreTools.Serialization.Wrappers
}
int offset = 0;
uint firstValue = SecureArea.ReadUInt32(ref offset);
uint secondValue = SecureArea.ReadUInt32(ref offset);
uint firstValue = SecureArea.ReadUInt32LittleEndian(ref offset);
uint secondValue = SecureArea.ReadUInt32LittleEndian(ref offset);
// Empty secure area standard
if (firstValue == 0x00000000 && secondValue == 0x00000000)