Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/Core/Unix/CoreService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -503,9 +503,9 @@ namespace VeraCrypt
throw_sys_if (fcntl (outPipe->GetReadFD(), F_SETFL, O_NONBLOCK) == -1);
throw_sys_if (fcntl (errPipe.GetReadFD(), F_SETFL, O_NONBLOCK) == -1);

vector <char> buffer (4096), errOutput (4096);
buffer.clear ();
errOutput.clear ();
char buffer[4096];
vector <char> errOutput;
errOutput.reserve (4096);

Poller poller (outPipe->GetReadFD(), errPipe.GetReadFD());
int status, waitRes;
Expand All @@ -518,10 +518,10 @@ namespace VeraCrypt
ssize_t bytesRead = 0;
foreach (int fd, poller.WaitForData (timeout))
{
bytesRead = read (fd, &buffer[0], buffer.capacity());
bytesRead = read (fd, buffer, sizeof (buffer));
if (bytesRead > 0 && fd == errPipe.GetReadFD())
{
errOutput.insert (errOutput.end(), buffer.begin(), buffer.begin() + bytesRead);
errOutput.insert (errOutput.end(), buffer, buffer + bytesRead);

if (bytesRead > 5 && bytesRead < 80) // Short message captured
timeout = 200;
Expand Down
Loading