SymbolInfo: get rid of a dangerous hack

2 files changed, 11 insertions, 11 deletions

diff --git a/include/pdb/symbol.hpp b/include/pdb/symbol.hpp
index 2e24a5a..3e0ab17 100644
--- a/include/pdb/symbol.hpp
+++ b/include/pdb/symbol.hpp
@@ -40,18 +40,18 @@ public:
     SymbolInfo();
     explicit SymbolInfo(const Impl& impl);
 
-    explicit operator Impl&() { return impl; }
-    explicit operator const Impl&() const { return impl; }
+    explicit operator Impl&() { return get_impl(); }
+    explicit operator const Impl&() const { return get_impl(); }
 
     Address get_displacement() const { return displacement; }
     void set_displacement(Address new_value) { displacement = new_value; }
 
-    std::string get_name() const { return {impl.Name, impl.NameLen}; }
+    std::string get_name() const { return {get_impl().Name, get_impl().NameLen}; }
 
-    Address get_offline_base() const { return impl.ModBase; }
-    Address get_offline_address() const { return impl.Address; }
+    Address get_offline_base() const { return get_impl().ModBase; }
+    Address get_offline_address() const { return get_impl().Address; }
 
-    symbol::Tag get_tag() const { return impl.Tag; }
+    symbol::Tag get_tag() const { return get_impl().Tag; }
 
     enum class Type : symbol::Tag {
         Function = symbol::SYM_TAG_FUNCTION,
@@ -68,8 +68,8 @@ private:
     std::array<unsigned char, max_buffer_size> buffer;
     Address displacement = 0;
 
-protected:
-    Impl& impl;
+    const Impl& get_impl() const { return *reinterpret_cast<const Impl*>(buffer.data()); }
+    Impl& get_impl() { return *reinterpret_cast<Impl*>(buffer.data()); }
 };
 
 class Symbol : public SymbolInfo {
diff --git a/src/symbol.cpp b/src/symbol.cpp
index 98ec427..4c271c0 100644
--- a/src/symbol.cpp
+++ b/src/symbol.cpp
@@ -36,10 +36,10 @@ unsigned long cast_line_number(DWORD impl) {
 
 } // namespace
 
-SymbolInfo::SymbolInfo() : buffer{}, impl{*reinterpret_cast<Impl*>(buffer.data())} {
+SymbolInfo::SymbolInfo() {
     buffer.fill(0);
-    impl.SizeOfStruct = sizeof(Impl);
-    impl.MaxNameLen = MAX_SYM_NAME;
+    get_impl().SizeOfStruct = sizeof(Impl);
+    get_impl().MaxNameLen = MAX_SYM_NAME;
 }
 
 SymbolInfo::SymbolInfo(const Impl& impl) : SymbolInfo{} {