aj/CincyLib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed EndOfStreamException thrown when trying to read LensType in older files.

Browse Source
This commit is contained in:
AJ
2019-03-11 09:10:42 -04:00
parent 056cb1fc8a
commit 9092c3385a
1 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
CincyLib/Laser/MaterialLibReader.cs
View File

@@ -112,6 +112,7 @@ namespace CincyLib.Laser
length = length * third + second + third; length = length * third + second + third;
} }
MaterialLib.Notes = Encoding.ASCII.GetString(reader.ReadBytes(length)); MaterialLib.Notes = Encoding.ASCII.GetString(reader.ReadBytes(length));
reader.BaseStream.Seek(4, SeekOrigin.Current); // Unknown 4 bytes reader.BaseStream.Seek(4, SeekOrigin.Current); // Unknown 4 bytes
@@ -124,17 +125,22 @@ namespace CincyLib.Laser
MaterialLib.PierceFocusNearField = Math.Round(reader.ReadSingle(), 4); MaterialLib.PierceFocusNearField = Math.Round(reader.ReadSingle(), 4);
MaterialLib.PierceFocusFarField = Math.Round(reader.ReadSingle(), 4); MaterialLib.PierceFocusFarField = Math.Round(reader.ReadSingle(), 4);
// older files wont go this far... long p;
const int seek = 18;
var hasExtendedInfo = reader.BaseStream.Length > reader.BaseStream.Position + seek; p = reader.BaseStream.Position + 18;
if (hasExtendedInfo) if (p >= reader.BaseStream.Length)
{ return;
reader.BaseStream.Seek(seek, SeekOrigin.Current);
reader.BaseStream.Seek(p, SeekOrigin.Begin);
MaterialLib.PierceNozzleStandoffRampTo = Math.Round(reader.ReadSingle(), 4); MaterialLib.PierceNozzleStandoffRampTo = Math.Round(reader.ReadSingle(), 4);
reader.BaseStream.Seek(54, SeekOrigin.Current); p = reader.BaseStream.Position + 54;
if (p >= reader.BaseStream.Length)
return;
reader.BaseStream.Seek(p, SeekOrigin.Begin);
var lensType = reader.ReadByte(); var lensType = reader.ReadByte();
switch (lensType) switch (lensType)
@@ -163,7 +169,6 @@ namespace CincyLib.Laser
MaterialLib.PierceType = (PierceType)reader.ReadByte(); MaterialLib.PierceType = (PierceType)reader.ReadByte();
} }
} }
}
public enum LensType public enum LensType
{ {