ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 12:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix some unnecessary crashes on mtrl.

Browse source
This commit is contained in:
Ottermandias 2022-09-25 18:32:31 +02:00
parent b359c18360
commit 35c6e0ec88
3 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Penumbra.GameData/Files/MtrlFile.cs
View file

@ -143,6 +143,7 @@ public partial class MtrlFile : IWritable
public RowArray Rows;
public string Name;
public ushort Index;
public bool HasRows;
}
public unsafe struct ColorDyeSet
@ -305,7 +306,15 @@ public partial class MtrlFile : IWritable
AdditionalData = r.ReadBytes( additionalDataSize );
for( var i = 0; i < ColorSets.Length; ++i )
{
ColorSets[ i ].Rows = r.ReadStructure< ColorSet.RowArray >();
if( stream.Position + ColorSet.RowArray.NumRows * ColorSet.Row.Size <= stream.Length )
{
ColorSets[ i ].Rows = r.ReadStructure< ColorSet.RowArray >();
ColorSets[ i ].HasRows = true;
}
else
{
ColorSets[i].HasRows = false;
}
}
for( var i = 0; i < ColorDyeSets.Length; ++i )