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

12
DiscImageChef.DiscImages/CDRDAO.cs
View File

@@ -244,7 +244,17 @@ namespace DiscImageChef.ImagePlugins
try
{
imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
tocStream = new StreamReader(imageFilter.GetDataForkStream());
byte[] testArray = new byte[512];
imageFilter.GetDataForkStream().Read(testArray, 0, 512);
imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
// Check for unexpected control characters that shouldn't be present in a text file and can crash this plugin
foreach(byte b in testArray)
{
if(b < 0x20 && b != 0x0A && b != 0x0D)
return false;
}
tocStream = new StreamReader(imageFilter.GetDataForkStream());
string _line = tocStream.ReadLine();
Regex Dr = new Regex(DiskTypeRegEx);