maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix deadlock in runProgram() when input is larger than the pipe buffer size

Browse source
This commit is contained in:
Eelco Dolstra 2017-03-13 14:56:33 +01:00
parent e8186085e0
commit fbbc4d8dda
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libutil/util.cc
View file

@ -870,11 +870,14 @@ string runProgram(Path program, bool searchPath, const Strings & args,
out.writeSide = -1; out.writeSide = -1;
/* FIXME: This can deadlock if the input is too long. */ std::thread writerThread;
if (!input.empty()) { if (!input.empty()) {
in.readSide = -1; in.readSide = -1;
writeFull(in.writeSide.get(), input); writerThread = std::thread([&]() {
in.writeSide = -1; writeFull(in.writeSide.get(), input);
in.writeSide = -1;
});
} }
string result = drainFD(out.readSide.get()); string result = drainFD(out.readSide.get());
@ -885,6 +888,9 @@ string runProgram(Path program, bool searchPath, const Strings & args,
throw ExecError(status, format("program ‘%1%’ %2%") throw ExecError(status, format("program ‘%1%’ %2%")
% program % statusToString(status)); % program % statusToString(status));
if (!input.empty())
writerThread.join();
return result; return result;
} }