Small style tweaks

fox-it · Aug 18, 2023 · 4942929 · 4942929
1 parent 9f43f05
commit 4942929
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/dissect/volume/disk/schemes/bsd.py b/dissect/volume/disk/schemes/bsd.py
@@ -322,38 +322,38 @@ def __init__(self, fh: BinaryIO, sector_size: int = 512):
         self.partitions = list(self._partitions())
 
     def _partitions(self) -> Iterator[Partition]:
+        table_offset = 0
         if self.type == 32:
             # Get the table offset first
             self.fh.seek(self._partitions_offset + (c_bsd.BSD_PART_RAW * len(c_bsd.partition)))
-            table_offset = c_bsd.partition(self.fh).p_offset * self.sector_size
-        else:
-            table_offset = 0
+            table_offset = c_bsd.partition(self.fh).p_offset
 
         self.fh.seek(self._partitions_offset)
         for i in range(self.disklabel.d_npartitions):
             if self.type == 32:
                 partition = c_bsd.partition(self.fh)
-                if i == c_bsd.BSD_PART_RAW or partition.p_offset == 0 or partition.p_fstype == 0:
+                if i == c_bsd.BSD_PART_RAW:
                     # Skip internal partition
                     continue
 
-                offset = partition.p_offset * self.sector_size
-                if offset < table_offset:
+                if partition.p_size == 0 or partition.p_fstype == 0:
+                    continue
+
+                if partition.p_offset < table_offset:
                     continue
-                offset -= table_offset
 
+                offset = (partition.p_offset - table_offset) * self.sector_size
                 size = partition.p_size * self.sector_size
                 guid = None
             elif self.type == 64:
                 partition = c_bsd.partition64(self.fh)
-                if (
-                    i == c_bsd.BSD_PART_RAW
-                    or (partition.p_boffset == 0 and partition.p_bsize == 0)
-                    or partition.p_fstype == 0
-                ):
+                if i == c_bsd.BSD_PART_RAW:
                     # Skip internal partition
                     continue
 
+                if (partition.p_boffset == 0 and partition.p_bsize == 0) or partition.p_fstype == 0:
+                    continue
+
                 offset = partition.p_boffset
                 size = partition.p_bsize
                 guid = partition.p_stor_uuid