dissect.cstruct 3.11.dev3__tar.gz → 3.12.dev2__tar.gz

{dissect.cstruct-3.11.dev3/dissect.cstruct.egg-info → dissect.cstruct-3.12.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 3.11.dev3
+Version: 3.12.dev2
 Summary: A Dissect module implementing a parser for C-like structures: structure parsing in Python made easy
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Apache License 2.0

{dissect.cstruct-3.11.dev3 → dissect.cstruct-3.12.dev2}/dissect/cstruct/types/structure.py

@@ -22,7 +22,7 @@ class Field:
         self.alignment = type_.alignment
 
     def __repr__(self):
-        bits_str = " : {self.bits}" if self.bits else ""
+        bits_str = f" : {self.bits}" if self.bits else ""
         return f"<Field {self.name} {self.type}{bits_str}>"
 
 
@@ -324,6 +324,12 @@ class Union(Structure):
             size = max(len(field.type), size)
             alignment = max(field.alignment, alignment)
 
+        if self.align and size is not None:
+            # Add "tail padding" if we need to align
+            # This bit magic rounds up to the next alignment boundary
+            # E.g. offset = 3; alignment = 8; -offset & (alignment - 1) = 5
+            size += -size & (alignment - 1)
+
         self.size = size
         self.alignment = alignment
 

{dissect.cstruct-3.11.dev3 → dissect.cstruct-3.12.dev2/dissect.cstruct.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 3.11.dev3
+Version: 3.12.dev2
 Summary: A Dissect module implementing a parser for C-like structures: structure parsing in Python made easy
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Apache License 2.0

{dissect.cstruct-3.11.dev3 → dissect.cstruct-3.12.dev2}/tests/test_align.py

@@ -72,6 +72,21 @@ def test_align_union():
     assert obj.dumps() == buf
 
 
+def test_align_union_tail():
+    d = """
+    union test {
+        uint64 a;
+        uint32 b[3];
+    };
+    """
+    c = cstruct.cstruct()
+    c.load(d, align=True)
+
+    assert c.test.align
+    assert c.test.alignment == 8
+    assert c.test.size == 16
+
+
 def test_align_array():
     d = """
     struct test {