Skip to content

Fix LocalStore::addMultipleToStore SinkToSource destructor unsoundness #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cole-h merged 1 commit into from
Jun 17, 2026
Merged

Fix LocalStore::addMultipleToStore SinkToSource destructor unsoundness #513

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/libstore/local-store.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,6 +1248,13 @@ void LocalStore::addMultipleToStore(

auto & info = item->first;

/* Make sure that the Source object is destroyed when
we're done. In particular, a SinkToSource object must
be destroyed to ensure that the destructors on its
stack frame are run; this includes
LegacySSHStore::narFromPath()'s connection lock. */
auto source = std::move(item->second);

MaintainCount<decltype(nrRunning)> mc(nrRunning);
showProgress();

Expand All @@ -1271,7 +1278,7 @@ void LocalStore::addMultipleToStore(
notice("reusing previously unpacked path at '%s'", printStorePath(info.path));
act.setExpected(actCopyPath, bytesExpected -= info.narSize);
} else {
doAddToStore(info, *item->second, repair);
doAddToStore(info, *source, repair);
/* The path has been unpacked, so mark it as such. */
writeFile(unpackedMarker, "");
}
Expand Down
Loading