From c8245c9fd5de5d24eee5718773117b6ee52353b3 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 16 May 2017 07:26:05 +0100 Subject: [PATCH] Do not skip text-based images on NULL, if they're smaller than 512 the test buffer gets NULL-filled. --- DiscImageChef.DiscImages/CDRDAO.cs | 2 +- DiscImageChef.DiscImages/CDRWin.cs | 2 +- DiscImageChef.DiscImages/CloneCD.cs | 2 +- DiscImageChef.DiscImages/GDI.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DiscImageChef.DiscImages/CDRDAO.cs b/DiscImageChef.DiscImages/CDRDAO.cs index 3ef22c8ae..5fdcbb19d 100644 --- a/DiscImageChef.DiscImages/CDRDAO.cs +++ b/DiscImageChef.DiscImages/CDRDAO.cs @@ -250,7 +250,7 @@ namespace DiscImageChef.ImagePlugins // 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) + if(b < 0x20 && b != 0x0A && b != 0x0D && b != 0x00) return false; } diff --git a/DiscImageChef.DiscImages/CDRWin.cs b/DiscImageChef.DiscImages/CDRWin.cs index 7b6d38196..c26a1281d 100644 --- a/DiscImageChef.DiscImages/CDRWin.cs +++ b/DiscImageChef.DiscImages/CDRWin.cs @@ -322,7 +322,7 @@ namespace DiscImageChef.ImagePlugins // 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) + if(b < 0x20 && b != 0x0A && b != 0x0D && b != 0x00) return false; } diff --git a/DiscImageChef.DiscImages/CloneCD.cs b/DiscImageChef.DiscImages/CloneCD.cs index 3fb5ad1fc..be34e516f 100644 --- a/DiscImageChef.DiscImages/CloneCD.cs +++ b/DiscImageChef.DiscImages/CloneCD.cs @@ -129,7 +129,7 @@ namespace DiscImageChef.DiscImages // 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) + if(b < 0x20 && b != 0x0A && b != 0x0D && b != 0x00) return false; } diff --git a/DiscImageChef.DiscImages/GDI.cs b/DiscImageChef.DiscImages/GDI.cs index e74b53a65..040081cc8 100644 --- a/DiscImageChef.DiscImages/GDI.cs +++ b/DiscImageChef.DiscImages/GDI.cs @@ -140,7 +140,7 @@ namespace DiscImageChef.ImagePlugins // 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) + if(b < 0x20 && b != 0x0A && b != 0x0D && b != 0x00) return false; } gdiStream = new StreamReader(imageFilter.GetDataForkStream());