From 86140b5b2fc3bffb760dfbc148283d5d3bb54d40 Mon Sep 17 00:00:00 2001
From: ISSOtm <me@eldred.fr>
Date: Sun, 18 Aug 2024 15:37:54 +0200
Subject: [PATCH] Correctly apply section fragment offsets to contained symbols

---
 src/link/object.cpp   |  2 +-
 src/link/sdas_obj.cpp | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/link/object.cpp b/src/link/object.cpp
index 946a58cc7..8f0ce88e8 100644
--- a/src/link/object.cpp
+++ b/src/link/object.cpp
@@ -625,7 +625,7 @@ void obj_ReadFile(char const *fileName, unsigned int fileID) {
 		if (auto *label = std::get_if<Label>(&fileSymbols[i].data); label) {
 			if (Section *section = label->section; section->modifier != SECTION_NORMAL) {
 				if (section->modifier == SECTION_FRAGMENT)
-					// Add the fragment's offset to the symbol's
+					// Add the fragment's offset to the symbol's (`section->offset` is computed by `sect_AddSection`)
 					label->offset += section->offset;
 				// Associate the symbol with the main section, not the "component" one
 				label->section = sect_GetSection(section->name);
diff --git a/src/link/sdas_obj.cpp b/src/link/sdas_obj.cpp
index 28677ed35..9b7efa033 100644
--- a/src/link/sdas_obj.cpp
+++ b/src/link/sdas_obj.cpp
@@ -868,14 +868,22 @@ void sdobj_ReadFile(FileStackNode const &where, FILE *file, std::vector<Symbol>
 			    section->size
 			);
 		}
-
-		if (section->modifier == SECTION_FRAGMENT) {
-			// Add the fragment's offset to all of its symbols
-			for (Symbol *symbol : section->symbols)
-				symbol->label().offset += section->offset;
-		}
-
 		// Calling `sect_AddSection` invalidates the contents of `fileSections`!
 		sect_AddSection(std::move(section));
 	}
+
+	// Fix symbols' section pointers to component sections
+	// This has to run **after** all the `sect_AddSection()` calls,
+	// so that `sect_GetSection()` will work
+	for (Symbol &sym : fileSymbols) {
+		if (auto *label = std::get_if<Label>(&sym.data); label) {
+			if (Section *section = label->section; section->modifier != SECTION_NORMAL) {
+				if (section->modifier == SECTION_FRAGMENT)
+					// Add the fragment's offset to the symbol's (`section->offset` is computed by `sect_AddSection`)
+					label->offset += section->offset;
+				// Associate the symbol with the main section, not the "component" one
+				label->section = sect_GetSection(section->name);
+			}
+		}
+	}
 }