smda 2.4.0__tar.gz → 2.4.2__tar.gz

{smda-2.4.0/smda.egg-info → smda-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: smda
-Version: 2.4.0
+Version: 2.4.2
 Summary: A recursive disassmbler optimized for CFG recovery from memory dumps. Based on capstone.
 Home-page: https://github.com/danielplohmann/smda
 Author: Daniel Plohmann
@@ -15,6 +15,20 @@ Classifier: Topic :: Security
 Classifier: Topic :: Software Development :: Disassemblers
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: capstone
+Requires-Dist: dncil
+Requires-Dist: dnfile
+Requires-Dist: lief>=0.16.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 
 # SMDA
@@ -119,6 +133,8 @@ make test
 ```
 
 ## Version History
+ * 2025-11-28: v2.4.2 - Fix for a bug when extracting and merging code areas from section tables. (THX: @r0ny123)
+ * 2025-11-28: v2.4.1 - Modernized packaging by also building a wheel. (THX: @dimbleby)
  * 2025-11-21: v2.4.0 - Integration of DelphiReSym by @WenzWenzWenz for Delphi VMT parsing, thanks to @r0ny123 for adapting it!!
  * 2025-10-21: v2.3.1 - Fixed lief error for section/segment flags in ELF files crashing file loading. Now properly parsing and providing symbol info for PEs in their own xmetadata section.
  * 2025-10-21: v2.3.0 - Major code refactor and cleanup, with many thanks to the contribution @r0ny123!!

{smda-2.4.0 → smda-2.4.2}/README.md

@@ -101,6 +101,8 @@ make test
 ```
 
 ## Version History
+ * 2025-11-28: v2.4.2 - Fix for a bug when extracting and merging code areas from section tables. (THX: @r0ny123)
+ * 2025-11-28: v2.4.1 - Modernized packaging by also building a wheel. (THX: @dimbleby)
  * 2025-11-21: v2.4.0 - Integration of DelphiReSym by @WenzWenzWenz for Delphi VMT parsing, thanks to @r0ny123 for adapting it!!
  * 2025-10-21: v2.3.1 - Fixed lief error for section/segment flags in ELF files crashing file loading. Now properly parsing and providing symbol info for PEs in their own xmetadata section.
  * 2025-10-21: v2.3.0 - Major code refactor and cleanup, with many thanks to the contribution @r0ny123!!

{smda-2.4.0 → smda-2.4.2}/setup.py

@@ -12,7 +12,7 @@ requirements.append("lief>=0.16.0")
 setup(
     name="smda",
     # note to self: always change this in config as well.
-    version="2.4.0",
+    version="2.4.2",
     description="A recursive disassmbler optimized for CFG recovery from memory dumps. Based on capstone.",
     long_description_content_type="text/markdown",
     long_description=long_description,

{smda-2.4.0 → smda-2.4.2}/smda/SmdaConfig.py

@@ -4,7 +4,7 @@ import os
 
 class SmdaConfig:
     # note to self: always change this in setup.py as well!
-    VERSION = "2.4.0"
+    VERSION = "2.4.2"
     ESCAPER_DOWNWARD_COMPATIBILITY = "1.13.16"
     CONFIG_FILE_PATH = str(os.path.abspath(__file__))
     PROJECT_ROOT = str(os.path.abspath(os.sep.join([CONFIG_FILE_PATH, "..", ".."])))

{smda-2.4.0 → smda-2.4.2}/smda/utility/PeFileLoader.py

@@ -160,17 +160,15 @@ class PeFileLoader:
 
     @staticmethod
     def mergeCodeAreas(code_areas):
-        merged_code_areas = sorted(code_areas)
-        result = []
-        index = 0
-        while index < len(merged_code_areas) - 1:
-            this_area = merged_code_areas[index]
-            next_area = merged_code_areas[index + 1]
-            if this_area[1] != next_area[0]:
-                result.append(this_area)
-                index += 1
+        if not code_areas:
+            return []
+        sorted_areas = sorted(code_areas)
+        result = [sorted_areas[0]]
+        for i in range(1, len(sorted_areas)):
+            last_area = result[-1]
+            current_area = sorted_areas[i]
+            if last_area[1] == current_area[0]:
+                result[-1] = [last_area[0], current_area[1]]
             else:
-                merged_code_areas = (
-                    merged_code_areas[:index] + [[this_area[0], next_area[1]]] + merged_code_areas[index + 2 :]
-                )
-        return merged_code_areas
+                result.append(current_area)
+        return result

{smda-2.4.0 → smda-2.4.2/smda.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: smda
-Version: 2.4.0
+Version: 2.4.2
 Summary: A recursive disassmbler optimized for CFG recovery from memory dumps. Based on capstone.
 Home-page: https://github.com/danielplohmann/smda
 Author: Daniel Plohmann
@@ -15,6 +15,20 @@ Classifier: Topic :: Security
 Classifier: Topic :: Software Development :: Disassemblers
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: capstone
+Requires-Dist: dncil
+Requires-Dist: dnfile
+Requires-Dist: lief>=0.16.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 
 # SMDA
@@ -119,6 +133,8 @@ make test
 ```
 
 ## Version History
+ * 2025-11-28: v2.4.2 - Fix for a bug when extracting and merging code areas from section tables. (THX: @r0ny123)
+ * 2025-11-28: v2.4.1 - Modernized packaging by also building a wheel. (THX: @dimbleby)
  * 2025-11-21: v2.4.0 - Integration of DelphiReSym by @WenzWenzWenz for Delphi VMT parsing, thanks to @r0ny123 for adapting it!!
  * 2025-10-21: v2.3.1 - Fixed lief error for section/segment flags in ELF files crashing file loading. Now properly parsing and providing symbol info for PEs in their own xmetadata section.
  * 2025-10-21: v2.3.0 - Major code refactor and cleanup, with many thanks to the contribution @r0ny123!!

{smda-2.4.0 → smda-2.4.2}/smda.egg-info/SOURCES.txt

@@ -2,11 +2,6 @@ LICENSE
 README.md
 pyproject.toml
 setup.py
-./smda/Disassembler.py
-./smda/DisassemblyResult.py
-./smda/DisassemblyStatistics.py
-./smda/SmdaConfig.py
-./smda/__init__.py
 smda/Disassembler.py
 smda/DisassemblyResult.py
 smda/DisassemblyStatistics.py
@@ -75,4 +70,5 @@ tests/testBracketQueue.py
 tests/testEscaper.py
 tests/testFileFormatParsers.py
 tests/testIntegration.py
+tests/testPeFileLoader.py
 tests/testTarjan.py

smda-2.4.2/tests/testPeFileLoader.py

@@ -0,0 +1,24 @@
+import unittest
+
+from smda.utility.PeFileLoader import PeFileLoader
+
+
+class PeFileLoaderTestSuite(unittest.TestCase):
+    def test_mergeCodeAreas(self):
+        test_cases = [
+            ("Overlapping intervals", [[1, 5], [3, 7], [8, 12]], [[1, 5], [3, 7], [8, 12]]),
+            ("Contiguous intervals", [[1, 5], [5, 10], [10, 15]], [[1, 15]]),
+            ("Unsorted contiguous intervals", [[10, 15], [1, 5], [5, 10]], [[1, 15]]),
+            ("Separated intervals", [[1, 5], [6, 10], [11, 15]], [[1, 5], [6, 10], [11, 15]]),
+            ("Empty list", [], []),
+            ("Single interval", [[1, 5]], [[1, 5]]),
+            ("Mixed intervals", [[1, 5], [5, 10], [11, 15], [15, 20]], [[1, 10], [11, 20]]),
+        ]
+
+        for name, intervals, expected in test_cases:
+            with self.subTest(msg=name):
+                self.assertEqual(PeFileLoader.mergeCodeAreas(intervals), expected)
+
+
+if __name__ == "__main__":
+    unittest.main()