mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2026-11-14 11:18:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for EndianBinaryReader

Browse Source
This commit is contained in:
VaDiM
2026-03-16 09:43:24 +03:00
parent 5719a6bab8
commit 1eb35015c3
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AssetStudio/EndianBinaryReader.cs
+19 -10
View File
@@ -1,6 +1,7 @@
using System;
using System.Buffers.Binary;
using System.IO;
using System.Runtime.CompilerServices;
namespace AssetStudio
{
@@ -10,6 +11,14 @@ namespace AssetStudio
public EndianType Endian;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void ReadToBuff(byte[] buff, int index, int count)
{
var read = Read(buff, index, count);
if (read == 0)
throw new EndOfStreamException();
}
public EndianBinaryReader(Stream stream, EndianType endian = EndianType.BigEndian) : base(stream)
{
Endian = endian;
@@ -26,7 +35,7 @@ namespace AssetStudio
{
if (Endian == EndianType.BigEndian)
{
Read(buffer, 0, 2);
ReadToBuff(buffer, 0, 2);
return BinaryPrimitives.ReadInt16BigEndian(buffer);
}
return base.ReadInt16();
@@ -36,7 +45,7 @@ namespace AssetStudio
{
if (Endian == EndianType.BigEndian)
{
Read(buffer, 0, 4);
ReadToBuff(buffer, 0, 4);
return BinaryPrimitives.ReadInt32BigEndian(buffer);
}
return base.ReadInt32();
@@ -46,7 +55,7 @@ namespace AssetStudio
{
if (Endian == EndianType.BigEndian)
{
Read(buffer, 0, 8);
ReadToBuff(buffer, 0, 8);
return BinaryPrimitives.ReadInt64BigEndian(buffer);
}
return base.ReadInt64();
@@ -56,7 +65,7 @@ namespace AssetStudio
{
if (Endian == EndianType.BigEndian)
{
Read(buffer, 0, 2);
ReadToBuff(buffer, 0, 2);
return BinaryPrimitives.ReadUInt16BigEndian(buffer);
}
return base.ReadUInt16();
@@ -66,7 +75,7 @@ namespace AssetStudio
{
if (Endian == EndianType.BigEndian)
{
Read(buffer, 0, 4);
ReadToBuff(buffer, 0, 4);
return BinaryPrimitives.ReadUInt32BigEndian(buffer);
}
return base.ReadUInt32();
@@ -76,7 +85,7 @@ namespace AssetStudio
{
if (Endian == EndianType.BigEndian)
{
Read(buffer, 0, 8);
ReadToBuff(buffer, 0, 8);
return BinaryPrimitives.ReadUInt64BigEndian(buffer);
}
return base.ReadUInt64();
@@ -87,7 +96,7 @@ namespace AssetStudio
{
if (Endian == EndianType.BigEndian)
{
Read(buffer, 0, 4);
ReadToBuff(buffer, 0, 4);
buffer.AsSpan(0, 4).Reverse();
return BitConverter.ToSingle(buffer, 0);
}
@@ -98,7 +107,7 @@ namespace AssetStudio
{
if (Endian == EndianType.BigEndian)
{
Read(buffer, 0, 8);
ReadToBuff(buffer, 0, 8);
buffer.AsSpan().Reverse();
return BitConverter.ToDouble(buffer, 0);
}
@@ -109,7 +118,7 @@ namespace AssetStudio
{
if (Endian == EndianType.BigEndian)
{
Read(buffer, 0, 4);
ReadToBuff(buffer, 0, 4);
return BinaryPrimitives.ReadSingleBigEndian(buffer);
}
return base.ReadSingle();
@@ -119,7 +128,7 @@ namespace AssetStudio
{
if (Endian == EndianType.BigEndian)
{
Read(buffer, 0, 8);
ReadToBuff(buffer, 0, 8);
return BinaryPrimitives.ReadDoubleBigEndian(buffer);
}
return base.ReadDouble();