Merge pull request #37 from Decompollaborate/develop

2.7.4

Author: AngheloAlf

CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.7.4] - 2025-03-19
+
+### Fixed
+
+- Fix size calculation for the last symbol of a section not properly accounting
+  if the first symbol of said section is a `static` symbol (meaning it is
+  missing from the mapfile).
+  - This fix only applies to GNU mapfiles.
+
 ## [2.7.3] - 2025-02-09
 
 ### Fixed
@@ -453,6 +462,7 @@ Full changes: <https://github.com/Decompollaborate/mapfile_parser/compare/702a73
 - Initial release
 
 [unreleased]: https://github.com/Decompollaborate/mapfile_parser/compare/master...develop
+[2.7.4]: https://github.com/Decompollaborate/mapfile_parser/compare/2.7.3...2.7.4
 [2.7.3]: https://github.com/Decompollaborate/mapfile_parser/compare/2.7.2...2.7.3
 [2.7.2]: https://github.com/Decompollaborate/mapfile_parser/compare/2.7.1...2.7.2
 [2.7.1]: https://github.com/Decompollaborate/mapfile_parser/compare/2.7.0...2.7.1

Cargo.lock

@@ -23,7 +23,7 @@ crate-type = ["cdylib", "staticlib", "rlib"]
 
 [dependencies]
 regex = "1.10.2"
-pyo3 = { version = "0.23.2", optional = true, features = ["extension-module"]}
+pyo3 = { version = "0.23.5", optional = true, features = ["extension-module"]}
 lazy_static = "1.4.0"
 serde = { version = "1.0", features = ["derive"], optional = true }
 

Cargo.toml

@@ -35,7 +35,7 @@ If you use a `requirements.txt` file in your repository, then you can add
 this library with the following line:
 
 ```txt
-mapfile_parser>=2.7.3,<3.0.0
+mapfile_parser>=2.7.4,<3.0.0
 ```
 
 #### Development version
@@ -74,7 +74,7 @@ cargo add mapfile_parser
 Or add the following line manually to your `Cargo.toml` file:
 
 ```toml
-mapfile_parser = "2.7.3"
+mapfile_parser = "2.7.4"
 ```
 
 ## Versioning and changelog

README.md

@@ -3,7 +3,7 @@
 
 [project]
 name = "mapfile_parser"
-version = "2.7.3"
+version = "2.7.4"
 description = "Map file parser library focusing decompilation projects"
 readme = "README.md"
 requires-python = ">=3.9"

pyproject.toml

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-__version_info__ = (2, 7, 3)
+__version_info__ = (2, 7, 4)
 __version__ = ".".join(map(str, __version_info__))# + "-dev0"
 __author__ = "Decompollaborate"
 

src/mapfile_parser/__init__.py

@@ -285,6 +285,12 @@ impl MapFile {
                     // of the file.
                     if let Some(first_sym) = file.symbols.first() {
                         sym_vrom += first_sym.vram - file.vram;
+
+                        // Aditionally, if the first symbol is missing then calculation of the size
+                        // for the last symbol would be wrong, since we subtract the accumulated
+                        // size of each symbol from the section's total size to calculate it.
+                        // We need to adjust the total size by this difference too.
+                        acummulated_size += first_sym.vram - file.vram;
                     }
 
                     // Calculate size of each symbol