aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

* DiscImageChef.DiscImages/GDI.cs:

Browse Source 
* DiscImageChef.DiscImages/CDRDAO.cs:
	* DiscImageChef.DiscImages/CDRWin.cs:
	  Prevent reading binary files.

	* DiscImageChef.Filters/MacBinary.cs:
	  Adds more sanity checks.
This commit is contained in:
Natalia Portillo
2016-09-17 21:23:01 +01:00
parent a7e64c86ae
commit dc31b282b6
6 changed files with 124 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
DiscImageChef.Filters/MacBinary.cs
View File

@@ -277,7 +277,8 @@ namespace DiscImageChef.Filters
header = BigEndianMarshal.ByteArrayToStructureBigEndian<MacBinaryHeader>(hdr_b);
return header.magic == MacBinaryMagic || (header.version == 0 && header.filename[0] > 0 && header.filename[0] < 64 &&
header.zero1 == 0 && header.zero2 == 0 && header.reserved == 0);
header.zero1 == 0 && header.zero2 == 0 && header.reserved == 0 && (
header.dataLength > 0 || header.resourceLength > 0));
}
public override bool Identify(Stream stream)
@@ -291,7 +292,8 @@ namespace DiscImageChef.Filters
header = BigEndianMarshal.ByteArrayToStructureBigEndian<MacBinaryHeader>(hdr_b);
return header.magic == MacBinaryMagic || (header.version == 0 && header.filename[0] > 0 && header.filename[0] < 64 &&
header.zero1 == 0 && header.zero2 == 0 && header.reserved == 0);
header.zero1 == 0 && header.zero2 == 0 && header.reserved == 0 && (
header.dataLength > 0 || header.resourceLength > 0));
}
public override bool Identify(string path)
@@ -306,7 +308,8 @@ namespace DiscImageChef.Filters
fstream.Close();
return header.magic == MacBinaryMagic || (header.version == 0 && header.filename[0] > 0 && header.filename[0] < 64 &&
header.zero1 == 0 && header.zero2 == 0 && header.reserved == 0);
header.zero1 == 0 && header.zero2 == 0 && header.reserved == 0 && (
header.dataLength > 0 || header.resourceLength > 0));
}
public override bool IsOpened()