From cd4a9300a56da15b12987eb2b7a48c6475b77785 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 4 Dec 2022 22:31:51 -0600 Subject: [PATCH] [ox/preloader] Fix Vector preloading --- deps/ox/src/ox/preloader/preloader.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/ox/src/ox/preloader/preloader.hpp b/deps/ox/src/ox/preloader/preloader.hpp index 1def42d8..293cf37b 100644 --- a/deps/ox/src/ox/preloader/preloader.hpp +++ b/deps/ox/src/ox/preloader/preloader.hpp @@ -188,7 +188,7 @@ constexpr ox::Error Preloader::field(CRStringView, const ox::BasicStri } else { a = restore; } - vecVal.items = sz ? PlatSpec::correctEndianness(static_cast(a) + PlatSpec::RomStart) : 0; + vecVal.items = PlatSpec::correctEndianness(static_cast(a) + PlatSpec::RomStart); oxReturnError(m_writer.seekp(a)); oxReturnError(m_writer.write(val->data(), sz)); oxReturnError(m_writer.seekp(restore)); @@ -306,7 +306,7 @@ constexpr ox::Error Preloader::fieldVector(CRStringView, const auto *v } // serialize the Vector oxReturnError(serialize(&m_writer, vecVal)); - m_ptrs.emplace_back(vecValPt + offsetof(ox::VectorMemMap, items), vecVal.items); + m_ptrs.emplace_back(m_writer.tellp() - PlatSpec::PtrSize, vecVal.items); return {}; }