[RSYM] When determining the current function, always prefer COFF symbols if they... 1742/head
authorThomas Faber <thomas.faber@reactos.org>
Sat, 20 Jul 2019 20:20:33 +0000 (22:20 +0200)
committerThomas Faber <thomas.faber@reactos.org>
Sat, 17 Aug 2019 08:22:36 +0000 (10:22 +0200)
sdk/tools/rsym/rsym.c

index 58f5960..9435c21 100644 (file)
@@ -720,7 +720,8 @@ MergeStabsAndCoffs(ULONG *MergedSymbolCount, PROSSYM_ENTRY *MergedSymbols,
     ULONG StabIndex, j;
     ULONG CoffIndex;
     ULONG_PTR StabFunctionStartAddress;
-    ULONG StabFunctionStringOffset, NewStabFunctionStringOffset;
+    ULONG StabFunctionStringOffset, NewStabFunctionStringOffset, CoffFunctionStringOffset;
+    PROSSYM_ENTRY CoffFunctionSymbol;
 
     *MergedSymbolCount = 0;
     if (StabSymbolsCount == 0)
@@ -737,6 +738,8 @@ MergeStabsAndCoffs(ULONG *MergedSymbolCount, PROSSYM_ENTRY *MergedSymbols,
 
     StabFunctionStartAddress = 0;
     StabFunctionStringOffset = 0;
+    CoffFunctionStringOffset = 0;
+    CoffFunctionSymbol = NULL;
     CoffIndex = 0;
     for (StabIndex = 0; StabIndex < StabSymbolsCount; StabIndex++)
     {
@@ -761,18 +764,22 @@ MergeStabsAndCoffs(ULONG *MergedSymbolCount, PROSSYM_ENTRY *MergedSymbols,
         StabIndex = j - 1;
 
         while (CoffIndex < CoffSymbolsCount &&
-               CoffSymbols[CoffIndex + 1].Address <= (*MergedSymbols)[*MergedSymbolCount].Address)
+               CoffSymbols[CoffIndex].Address <= (*MergedSymbols)[*MergedSymbolCount].Address)
         {
+            if (CoffSymbols[CoffIndex].FunctionOffset != 0)
+            {
+                CoffFunctionSymbol = &CoffSymbols[CoffIndex];
+                CoffFunctionStringOffset = CoffFunctionSymbol->FunctionOffset;
+            }
             CoffIndex++;
         }
         NewStabFunctionStringOffset = (*MergedSymbols)[*MergedSymbolCount].FunctionOffset;
-        if (CoffSymbolsCount > 0 &&
-            CoffSymbols[CoffIndex].Address < (*MergedSymbols)[*MergedSymbolCount].Address &&
-            StabFunctionStartAddress < CoffSymbols[CoffIndex].Address &&
-            CoffSymbols[CoffIndex].FunctionOffset != 0)
+        if (CoffFunctionSymbol &&
+            CoffFunctionSymbol->Address <= (*MergedSymbols)[*MergedSymbolCount].Address &&
+            StabFunctionStartAddress < CoffFunctionSymbol->Address)
         {
-            (*MergedSymbols)[*MergedSymbolCount].FunctionOffset = CoffSymbols[CoffIndex].FunctionOffset;
-            CoffSymbols[CoffIndex].FileOffset = CoffSymbols[CoffIndex].FunctionOffset = 0;
+            (*MergedSymbols)[*MergedSymbolCount].FunctionOffset = CoffFunctionStringOffset;
+            CoffFunctionSymbol->FunctionOffset = 0;
         }
         if (StabFunctionStringOffset != NewStabFunctionStringOffset)
         {