lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Revert "libstore: using throwing finally in withFramedSink"

Browse source 
This reverts commit 491caad6f62c21ffbcdebe662e63ec0f72e6f3a2.

this is not actually legal for nix! throwing exceptions in destructors
is fine, but the way nix is set up we'll end up throwing the exception
we received from the remote *twice* in some cases, and such cases will
cause an immediate terminate without active exception.

Change-Id: I74c46b9f26fd791086e4193ec60eb1deb9a5bb2a
This commit is contained in:
eldritch horrors 2024-04-04 17:27:27 +02:00
parent c77b6e1fdd
commit ad30972867
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/libstore/remote-store.cc
View file

@ -1067,15 +1067,27 @@ void RemoteStore::ConnectionHandle::withFramedSink(std::function<void(Sink & sin
Finally joinStderrThread([&]()
{
stderrThread.join();
if (ex) {
std::rethrow_exception(ex);
if (stderrThread.joinable()) {
stderrThread.join();
if (ex) {
try {
std::rethrow_exception(ex);
} catch (...) {
ignoreException();
}
}
}
});
FramedSink sink((*this)->to, ex);
fun(sink);
sink.flush();
{
FramedSink sink((*this)->to, ex);
fun(sink);
sink.flush();
}
stderrThread.join();
if (ex)
std::rethrow_exception(ex);
}
}