From a31d35c04e2f01c96db581247e4ca1abb76485d1 Mon Sep 17 00:00:00 2001
From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com>
Date: Tue, 27 Feb 2024 19:09:59 -0600
Subject: [PATCH] Fixes

---
 src/symbols/symbols_with_dbghelp.cpp  | 7 +++++--
 src/symbols/symbols_with_libdwarf.cpp | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/symbols/symbols_with_dbghelp.cpp b/src/symbols/symbols_with_dbghelp.cpp
index 929419e..71e9203 100644
--- a/src/symbols/symbols_with_dbghelp.cpp
+++ b/src/symbols/symbols_with_dbghelp.cpp
@@ -345,6 +345,7 @@ namespace dbghelp {
                     std::fprintf(stderr, "Stack trace: Internal error while calling SymSetContext\n");
                     return {
                         addr,
+                        0,
                         { static_cast<std::uint32_t>(line.LineNumber) },
                         nullable<std::uint32_t>::null(),
                         line.FileName,
@@ -377,6 +378,7 @@ namespace dbghelp {
                 signature = std::regex_replace(signature, comma_re, ", ");
                 return {
                     addr,
+                    0,
                     { static_cast<std::uint32_t>(line.LineNumber) },
                     nullable<std::uint32_t>::null(),
                     line.FileName,
@@ -386,6 +388,7 @@ namespace dbghelp {
             } else {
                 return {
                     addr,
+                    0,
                     nullable<std::uint32_t>::null(),
                     nullable<std::uint32_t>::null(),
                     "",
@@ -394,7 +397,7 @@ namespace dbghelp {
                 };
             }
         } else {
-            return { addr, nullable<std::uint32_t>::null(), nullable<std::uint32_t>::null(), "", "", false };
+            return { addr, 0, nullable<std::uint32_t>::null(), nullable<std::uint32_t>::null(), "", "", false };
         }
     }
 
@@ -421,7 +424,7 @@ namespace dbghelp {
                     throw;
                 }
                 auto entry = null_frame;
-                entry.address = frame;
+                entry.raw_address = frame;
                 trace.push_back(entry);
             }
         }
diff --git a/src/symbols/symbols_with_libdwarf.cpp b/src/symbols/symbols_with_libdwarf.cpp
index 3cca565..72e4073 100644
--- a/src/symbols/symbols_with_libdwarf.cpp
+++ b/src/symbols/symbols_with_libdwarf.cpp
@@ -1006,6 +1006,7 @@ namespace libdwarf {
                 return {
                     {
                         frame_info.raw_address,
+                        frame_info.object_address,
                         nullable<std::uint32_t>::null(),
                         nullable<std::uint32_t>::null(),
                         frame_info.object_path,
@@ -1100,6 +1101,7 @@ namespace libdwarf {
             return {
                 {
                     frame_info.raw_address,
+                    frame_info.object_address,
                     nullable<std::uint32_t>::null(),
                     nullable<std::uint32_t>::null(),
                     frame_info.object_path,