Handle some invalid parsing cases that were missed previously

Author: mnadareski

SabreTools.Serialization/Deserializers/NewExecutable.cs

@@ -420,7 +420,14 @@ public static PerSegmentData ParsePerSegmentData(Stream data)
             obj.RelocationRecords = new RelocationRecord[obj.RelocationRecordCount];
             for (int i = 0; i < obj.RelocationRecords.Length; i++)
             {
-                obj.RelocationRecords[i] = ParseRelocationRecord(data);
+                if (data.Position >= data.Length)
+                    break;
+
+                var record = ParseRelocationRecord(data);
+                if (record == null)
+                    break;
+
+                obj.RelocationRecords[i] = record;
             }
 
             return obj;
@@ -433,12 +440,20 @@ public static PerSegmentData ParsePerSegmentData(Stream data)
         /// <returns>Filled RelocationRecord on success, null on error</returns>
         public static RelocationRecord ParseRelocationRecord(Stream data)
         {
+            // Handle partial relocation sections
+            if (data.Position > data.Length - 4)
+                return null;
+
             var obj = new RelocationRecord();
 
             obj.SourceType = (RelocationRecordSourceType)data.ReadByteValue();
             obj.Flags = (RelocationRecordFlag)data.ReadByteValue();
             obj.Offset = data.ReadUInt16LittleEndian();
 
+            // Handle incomplete entries
+            if (data.Position > data.Length - 4)
+                return obj;
+
             switch (obj.Flags & RelocationRecordFlag.TARGET_MASK)
             {
                 case RelocationRecordFlag.INTERNALREF:

SabreTools.Serialization/Deserializers/PortableExecutable.cs

@@ -1601,7 +1601,7 @@ public static void ParseResourceData(Stream data,
                         continue;
 
                     // If the offset is within the table data, read from there
-                    if (nextOffset - tableStart + entry.DataEntry.Size <= tableLength)
+                    if (nextOffset > tableStart && nextOffset - tableStart + entry.DataEntry.Size <= tableLength)
                     {
                         dataOffset = (int)(nextOffset - tableStart);
                         entry.DataEntry.Data = tableData.ReadBytes(ref dataOffset, (int)entry.DataEntry.Size);

SabreTools.Serialization/Extensions.PortableExecutable.cs

@@ -729,7 +729,7 @@ public static SecuROMAddDEntry ParseSecuROMAddDEntry(this byte[] data, ref int o
                     #region Creation data
 
                     dialogItemTemplate.CreationDataSize = entry.Data.ReadUInt16LittleEndian(ref offset);
-                    if (dialogItemTemplate.CreationDataSize != 0)
+                    if (dialogItemTemplate.CreationDataSize != 0 && dialogItemTemplate.CreationDataSize + offset < entry.Data.Length)
                         dialogItemTemplate.CreationData = entry.Data.ReadBytes(ref offset, dialogItemTemplate.CreationDataSize);
 
                     #endregion