Check range-specific values in layerbreak

mnadareski · mnadareski · commit 94fd61467338 · 2025-12-02T08:36:57.000-05:00
diff --git a/CHANGELIST.md b/CHANGELIST.md
@@ -1,6 +1,7 @@
 ### WIP (xxxx-xx-xx)
 
 - Check for null or empty layerbreak arrays
+- Check range-specific values in layerbreak
 
 ### 3.6.0 (2025-11-28)
 
diff --git a/MPF.Processors/ProcessingTool.cs b/MPF.Processors/ProcessingTool.cs
@@ -253,10 +253,10 @@ public static bool GetLayerbreaks(DiscInformation? di, out long? layerbreak1, ou
             // Wrap big-endian reading
             static int ReadFromArrayBigEndian(byte[]? bytes, int offset)
             {
-                if (bytes.IsNullOrEmpty())
+                if (bytes == null || bytes.Length < offset + 4)
                     return default;
 
-                return bytes!.ReadInt32BigEndian(ref offset);
+                return bytes.ReadInt32BigEndian(ref offset);
             }
 
             // Layerbreak 1 (2+ layers)

Original file line number	Diff line number	Diff line change
`@@ -253,10 +253,10 @@ public static bool GetLayerbreaks(DiscInformation? di, out long? layerbreak1, ou`
`253`	`253`	`// Wrap big-endian reading`
`254`	`254`	`static int ReadFromArrayBigEndian(byte[]? bytes, int offset)`
`255`	`255`	`{`
`256`		`- if (bytes.IsNullOrEmpty())`
	`256`	`+ if (bytes == null \|\| bytes.Length < offset + 4)`
`257`	`257`	`return default;`
`258`	`258`
`259`		`- return bytes!.ReadInt32BigEndian(ref offset);`
	`259`	`+ return bytes.ReadInt32BigEndian(ref offset);`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`// Layerbreak 1 (2+ layers)`