From 9dc61e9faca5e8b05a1a2a2eed83a5468aeb6202 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Wed, 27 Nov 2024 17:36:43 +0100 Subject: Ensure gitstrarray gets created with alive pointers. --- src/buildtool/file_system/git_repo.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/buildtool/file_system/git_repo.cpp') diff --git a/src/buildtool/file_system/git_repo.cpp b/src/buildtool/file_system/git_repo.cpp index d3ffb250..0ad5048c 100644 --- a/src/buildtool/file_system/git_repo.cpp +++ b/src/buildtool/file_system/git_repo.cpp @@ -2104,6 +2104,21 @@ auto GitRepo::CreateTreeFromDirectory(std::filesystem::path const& dir, #endif // BOOTSTRAP_BUILD_TOOL } +void GitRepo::GitStrArray::AddEntry(std::string entry) { + std::size_t const prev_capacity = entries_.capacity(); + entries_.emplace_back(std::move(entry)); + if (prev_capacity == entries_.capacity()) { + entry_pointers_.push_back(entries_.back().data()); + } + else { + // update pointers if reallocation happened + entry_pointers_.resize(entries_.size()); + for (std::size_t i = 0; i < entries_.size(); ++i) { + entry_pointers_[i] = entries_[i].data(); + } + } +} + auto GitRepo::GitStrArray::Get() & noexcept -> git_strarray { return git_strarray{.strings = entry_pointers_.data(), .count = entry_pointers_.size()}; -- cgit v1.2.3