Correct exception handling. Fixes #50

Lazza · May 29, 2019 · 18090ab · 18090ab
1 parent 94f716d
commit 18090ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/recuperabit/fs/ntfs.py b/recuperabit/fs/ntfs.py
@@ -174,10 +174,8 @@ def parse_indx_record(entry):
                     entry[offset + 16:],
                     attr_types_fmt['$FILE_NAME']
                 )
-            except UnicodeDecodeError:  # Invalid file name
-                pass
-            except TypeError:   # Invalid name length
-                pass
+            except (UnicodeDecodeError, TypeError):  # Invalid file name or invalid name length
+                break
             # Perform checks to avoid false positives
             name_ok = file_name['name'] is not None
             namespace_ok = 0 <= file_name['namespace'] <= 3

diff --git a/recuperabit/utils.py b/recuperabit/utils.py
@@ -46,7 +46,7 @@ def sectors(image, offset, size, bsize=sector_size, fill=True):
     if read:
         try:
             dump = image.read(size * bsize)
-        except IOError, MemoryError:
+        except (IOError, MemoryError):
             logging.warning(
                 "Cannot read sector(s). Filling with 0x00. Offset: {} Size: "
                 "{} Bsize: {}".format(offset, size, bsize)