Don't try to read past partition end.

DiscImageChef.Filesystems/Acorn.cs

@@ -391,6 +391,9 @@ namespace DiscImageChef.Filesystems
             if(bootBlockSize % imagePlugin.ImageInfo.sectorSize > 0)
                 sectorsToRead++;
 
+            if(sbSector + partition.Start + sectorsToRead >= partition.End)
+                return false;
+
             byte[] bootSector = imagePlugin.ReadSectors(sbSector + partition.Start, sectorsToRead);
             int bootChk = 0;
             for(int i = 0; i < 0x1FF; i++)

DiscImageChef.Filesystems/BTRFS.cs

@@ -130,7 +130,7 @@ namespace DiscImageChef.Filesystems
             ulong sbSectorOff = 0x10000 / imagePlugin.GetSectorSize();
             uint sbSectorSize = 0x1000 / imagePlugin.GetSectorSize();
 
-            if((sbSectorOff + sbSectorSize) >= partition.End)
+            if((sbSectorOff + partition.Start) >= partition.End)
                 return false;
 
             byte[] sector = imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSectorSize);

DiscImageChef.Filesystems/F2FS.cs

@@ -139,6 +139,9 @@ namespace DiscImageChef.Filesystems
             if(Marshal.SizeOf(f2fsSb) % imagePlugin.GetSectorSize() != 0)
                 sbSize++;
 
+            if(partition.Start + sbAddr >= partition.End)
+                return false;
+
             byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
             if(sector.Length < Marshal.SizeOf(f2fsSb))
                 return false;

DiscImageChef.Filesystems/FAT.cs

@@ -143,14 +143,17 @@ namespace DiscImageChef.Filesystems
                 return false;
 
             // HPFS
-            uint hpfs_magic1, hpfs_magic2;
+            if(16 + partition.Start <= partition.End)
+            {
+                uint hpfs_magic1, hpfs_magic2;
 
-            byte[] hpfs_sb_sector = imagePlugin.ReadSector(16 + partition.Start); // Seek to superblock, on logical sector 16
+                byte[] hpfs_sb_sector = imagePlugin.ReadSector(16 + partition.Start); // Seek to superblock, on logical sector 16
-            hpfs_magic1 = BitConverter.ToUInt32(hpfs_sb_sector, 0x000);
+                hpfs_magic1 = BitConverter.ToUInt32(hpfs_sb_sector, 0x000);
-            hpfs_magic2 = BitConverter.ToUInt32(hpfs_sb_sector, 0x004);
+                hpfs_magic2 = BitConverter.ToUInt32(hpfs_sb_sector, 0x004);
 
-            if(hpfs_magic1 == 0xF995E849 && hpfs_magic2 == 0xFA53E9C5)
+                if(hpfs_magic1 == 0xF995E849 && hpfs_magic2 == 0xFA53E9C5)
-                return false;
+                    return false;
+            }
 
             // FAT32 for sure
             if(bits_in_bps == 1 && correct_spc && fats_no <= 2 && sectors == 0 && fat_sectors == 0 && fat32_signature == 0x29 && fat32_string == "FAT32   ")
@@ -840,7 +843,7 @@ namespace DiscImageChef.Filesystems
                     StringBuilder atariSb = new StringBuilder();
                     atariSb.AppendFormat("cmdload will be loaded with value {0:X4}h", BigEndianBitConverter.ToUInt16(bpb_sector, 0x01E)).AppendLine();
                     atariSb.AppendFormat("Boot program will be loaded at address {0:X4}h", atariBPB.ldaaddr).AppendLine();
-                    atariSb.AppendFormat("FAT and directory will be cahed at address {0:X4}h", atariBPB.fatbuf).AppendLine();
+                    atariSb.AppendFormat("FAT and directory will be cached at address {0:X4}h", atariBPB.fatbuf).AppendLine();
                     if(atariBPB.ldmode == 0)
                     {
                         byte[] tmp = new byte[8];
@@ -1130,8 +1133,12 @@ namespace DiscImageChef.Filesystems
             public ushort sectcnt;
             /// <summary>Address where boot code should be loaded.</summary>
             public ushort ldaaddr;
+            /// <summary>Padding.</summary>
+            public ushort padding;
             /// <summary>Address where FAT and root directory sectors must be loaded.</summary>
             public ushort fatbuf;
+            /// <summary>Unknown.</summary>
+            public ushort unknown;
             /// <summary>Filename to be loaded for booting.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
             public byte[] fname;

DiscImageChef.Filesystems/HPFS.cs

@@ -59,10 +59,7 @@ namespace DiscImageChef.Filesystems
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
         {
-            if((2 + partition.Start) >= partition.End)
+            if((16 + partition.Start) >= partition.End)
-                return false;
-
-            if(imagePlugin.ImageInfo.sectors <= 16)
                 return false;
 
             uint magic1, magic2;

DiscImageChef.Filesystems/JFS.cs

@@ -152,6 +152,9 @@ namespace DiscImageChef.Filesystems
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
         {
             uint bootSectors = JFS_BootBlocksSize / imagePlugin.GetSectorSize();
+            if(partition.Start + bootSectors >= partition.End)
+                return false;
+            
             byte[] sector = imagePlugin.ReadSector(partition.Start + bootSectors);
             if(sector.Length < 512)
                 return false;

DiscImageChef.Filesystems/NILFS2.cs

@@ -127,6 +127,9 @@ namespace DiscImageChef.Filesystems
             if(Marshal.SizeOf(nilfsSb) % imagePlugin.GetSectorSize() != 0)
                 sbSize++;
 
+            if(partition.Start + sbAddr + sbSize >= partition.End)
+                return false;
+
             byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
             if(sector.Length < Marshal.SizeOf(nilfsSb))
                 return false;

DiscImageChef.Filesystems/PFS.cs

@@ -180,7 +180,7 @@ namespace DiscImageChef.Filesystems
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
         {
-            if(partition.Start >= partition.End)
+            if(partition.Length < 3)
                 return false;
 
             BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;

DiscImageChef.Filesystems/ProDOS.cs

@@ -96,7 +96,7 @@ namespace DiscImageChef.Filesystems
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
         {
-            if(partition.End < 3)
+            if(partition.Length < 3)
                 return false;
 
             // Blocks 0 and 1 are boot code

DiscImageChef.Filesystems/QNX6.cs

@@ -123,6 +123,9 @@ namespace DiscImageChef.Filesystems
             uint sectors = QNX6_SuperBlockSize / imagePlugin.GetSectorSize();
             uint bootSectors = QNX6_BootBlocksSize / imagePlugin.GetSectorSize();
 
+            if(partition.Start + bootSectors + sectors >= partition.End)
+                return false;
+
             byte[] audiSector = imagePlugin.ReadSectors(partition.Start, sectors);
             byte[] sector = imagePlugin.ReadSectors(partition.Start + bootSectors, sectors);
             if(sector.Length < QNX6_SuperBlockSize)

DiscImageChef.Filesystems/Reiser.cs

@@ -121,6 +121,9 @@ namespace DiscImageChef.Filesystems
             if(Marshal.SizeOf(reiserSb) % imagePlugin.GetSectorSize() != 0)
                 sbSize++;
 
+            if(partition.Start + sbAddr + sbSize >= partition.End)
+                return false;
+
             byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
             if(sector.Length < Marshal.SizeOf(reiserSb))
                 return false;

DiscImageChef.Filesystems/Reiser4.cs

@@ -86,6 +86,9 @@ namespace DiscImageChef.Filesystems
             if(Marshal.SizeOf(reiserSb) % imagePlugin.GetSectorSize() != 0)
                 sbSize++;
 
+            if(partition.Start + sbAddr + sbSize >= partition.End)
+                return false;
+
             byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
             if(sector.Length < Marshal.SizeOf(reiserSb))
                 return false;

DiscImageChef.Filesystems/UCSDPascal/Info.cs

@@ -41,7 +41,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
     {
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
         {
-            if(imagePlugin.GetSectors() < 3)
+            if(partition.Length < 3)
                 return false;
 
             // Blocks 0 and 1 are boot code

DiscImageChef.Filesystems/VxFS.cs

@@ -210,10 +210,11 @@ namespace DiscImageChef.Filesystems
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
         {
-            if(partition.Start >= partition.End)
-                return false;
-
             ulong vmfsSuperOff = VxFS_Base / imagePlugin.ImageInfo.sectorSize;
+
+            if(partition.Start + vmfsSuperOff >= partition.End)
+                return false;
+            
             byte[] sector = imagePlugin.ReadSector(partition.Start + vmfsSuperOff);
 
             uint magic = BitConverter.ToUInt32(sector, 0x00);