Block unexpected ISOs from splitting

Author: Deterous

Program.cs

@@ -52,6 +52,7 @@ static void Main(string[] args)
                 }
             }
 
+            /*
             for (int i = 0; i < XISO_LENGTH.Length; i++)
             {
                 if (XISO_LENGTH[i] == isoSize)
@@ -61,6 +62,13 @@ static void Main(string[] args)
                     break;
                 }
             }
+            */
+
+            if (xgdType == null)
+            {
+                Console.WriteLine("Unexpected ISO size. Is this a valid redump ISO?");
+                return;
+            }
 
             // Compare PVD against known PVDs to determine wave
             int? wave = null;
@@ -130,13 +138,20 @@ static void Main(string[] args)
                         19 => 12,
                         20 => 13,
                         21 => 14,
-                        _ => 16,
+                        _ => -1,
                     },
                     5 => 14,
                     6 => 15,
-                    7 or _ => 16,
+                    7 => 16,
+                    _ => -1,
                 };
 
+                if (videoType == -1)
+                {
+                    Console.WriteLine("Unexpected video partition. Cannot determine wave");
+                    return;
+                }
+
                 long l0Length = VIDEO_L0_LENGTH[videoType];
                 long l1Length = VIDEO_L1_LENGTH[videoType];
 
@@ -183,9 +198,16 @@ static void Main(string[] args)
                     0 => 0,
                     1 or 2 or 3 or 4 => 1,
                     5 => 2,
-                    6 or 7 or _ => 3,
+                    6 or 7 => 3,
+                    _ => -1,
                 };
 
+                if (xisoType == -1)
+                {
+                    Console.WriteLine("Unexpected ISO size. Is this a valid redump ISO?");
+                    return;
+                }
+
                 isoFS.Seek(XISO_OFFSET[xisoType], SeekOrigin.Begin);
 
                 byte[] buf = new byte[1024 * 2048];