Changeset 1884 for trunk/eraser6

Timestamp:

3/6/2010 8:32:07 AM (3 years ago)

Author:

lowjoel

Message:

Forward port from Eraser 6.0: Potential fix for the "Insufficient disk space" error when deleting files securely. My hypothesis is that invalidly-named files cause the file system to allocate file entries differently (we rename the same file with a name of the same length to eliminate reallocation of MFT entries) so this patch will fix that, ensuring filenames are always valid.

Location:

trunk/eraser6

Files:

• . (modified) (1 prop)
• Eraser.Manager/FileSystem.cs (modified) (1 diff)
• Eraser.msbuild (modified) (1 prop)
• Eraser/BlackBoxMainForm.it.resx (modified) (1 prop)
• Eraser/BlackBoxUploadForm.it.resx (modified) (1 prop)

trunk/eraser6/Eraser.Manager/FileSystem.cs

@@ -67 +67 @@
                     "ABCDEFGHIJKLMNOPQRSTUVWXYZ _+=-()[]{}',`~!";
                 for (int j = 0, k = resultAry.Length; j < k; ++j)
+                {
                     resultAry[j] = (byte)validFileNameChars[
                         (int)resultAry[j] % validFileNameChars.Length];
+
+                    if (j == 0 || j == k - 1)
+                        //The first or last character cannot be whitespace
+                        while (Char.IsWhiteSpace((char)resultAry[j]))
+                            resultAry[j] = (byte)validFileNameChars[
+                                (int)resultAry[j] % validFileNameChars.Length];
+                }
 
                 result = Encoding.UTF8.GetString(resultAry);