Fix file_wipe() for special files

Fixes bleachbit#875
mkhon · Apr 26, 2020 · 1b7668a · 1b7668a
1 parent 12523a7
commit 1b7668a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/bleachbit/WindowsWipe.py b/bleachbit/WindowsWipe.py
@@ -399,7 +399,7 @@ def spike_cluster(volume_handle, cluster, tmp_file_path):
 # should look.
 def check_mapped_bit(volume_bitmap, lcn):
     assert isinstance(lcn, int)
-    mapped_bit = ord(volume_bitmap[lcn // 8])
+    mapped_bit = volume_bitmap[lcn // 8]
     bit_location = lcn % 8    # zero-based
     if bit_location > 0:
         mapped_bit = mapped_bit >> bit_location
@@ -436,6 +436,11 @@ def open_file(file_name, mode=GENERIC_READ):
     return file_handle
 
 
+# Close file
+def close_file(file_handle):
+    CloseHandle(file_handle)
+
+
 # Get some basic information about a file.
 def get_file_basic_info(file_name, file_handle):
     file_attributes = GetFileAttributesW(file_name)

diff --git a/tests/TestWindows.py b/tests/TestWindows.py
@@ -373,7 +373,8 @@ def test_file_wipe(self):
         There are more tests in testwipe.py
         """
 
-        from bleachbit.WindowsWipe import file_wipe
+        from bleachbit.WindowsWipe import file_wipe, open_file, close_file, file_make_sparse
+        from win32file import GENERIC_WRITE
 
         dirname = tempfile.mkdtemp(prefix='bleachbit-file-wipe')
 
@@ -390,10 +391,14 @@ def _write_file(longname, contents):
                 self.assertExists(shortname)
                 return shortname
 
-            def _test_wipe(contents):
+            def _test_wipe(contents, is_sparse=False):
                 shortname = _write_file(longname, contents)
-                logger.debug('test_file_wipe(): filename length={}, shortname length ={}, contents length={}'.format(
-                    len(longname), len(shortname), len(contents)))
+                if is_sparse:
+                    fh = open_file(extended_path(longname), mode=GENERIC_WRITE)
+                    file_make_sparse(fh)
+                    close_file(fh)
+                logger.debug('test_file_wipe(): filename length={}, shortname length ={}, contents length={}, is_sparse={}'.format(
+                    len(longname), len(shortname), len(contents), is_sparse))
                 if shell.IsUserAnAdmin():
                     # wiping requires admin privileges
                     file_wipe(shortname)
@@ -412,6 +417,9 @@ def _test_wipe(contents):
             # requires wiping of extents
             _test_wipe(b'secret' * 100000)
 
+            # requires wiping of extents: special file case
+            _test_wipe(b'secret' * 100000, is_sparse=True)
+
         shutil.rmtree(dirname, True)
 
         if shell.IsUserAnAdmin():