Ensure gitstrarray gets created with alive pointers.

2 files changed, 16 insertions, 5 deletions

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()};
diff --git a/src/buildtool/file_system/git_repo.hpp b/src/buildtool/file_system/git_repo.hpp
index 11393ff9..94fae348 100644
--- a/src/buildtool/file_system/git_repo.hpp
+++ b/src/buildtool/file_system/git_repo.hpp
@@ -384,11 +384,7 @@ class GitRepo {
 
     class GitStrArray final {
       public:
-        void AddEntry(std::string entry) {
-            char* const entry_ptr =
-                entries_.emplace_back(std::move(entry)).data();
-            entry_pointers_.push_back(entry_ptr);
-        }
+        void AddEntry(std::string entry);
         [[nodiscard]] auto Get() & noexcept -> git_strarray;
 
       private: