Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2025-03-23 23:58:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1893 from cohcho/fix_partial_read

Browse source 
LineReader: fix partial read
This commit is contained in:
xmrig 2020-10-14 14:47:51 +07:00 committed by GitHub
commit 677d287135
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/base/net/tools/LineReader.cpp
View file

@ -38,12 +38,7 @@ void xmrig::LineReader::parse(char *data, size_t size)
return; return;
} }
if (!m_buf) { getline(data, size);
return getline(data, size);
}
add(data, size);
getline(m_buf, m_pos);
} }
@ -60,6 +55,7 @@ void xmrig::LineReader::reset()
void xmrig::LineReader::add(const char *data, size_t size) void xmrig::LineReader::add(const char *data, size_t size)
{ {
if (size > NetBuffer::kChunkSize - m_pos) { if (size > NetBuffer::kChunkSize - m_pos) {
// it breakes correctness silently for long lines
return; return;
} }
@ -85,7 +81,12 @@ void xmrig::LineReader::getline(char *data, size_t size)
end++; end++;
const auto len = static_cast<size_t>(end - start); const auto len = static_cast<size_t>(end - start);
if (len > 1) { if (m_pos) {
add(start, len);
m_listener->onLine(m_buf, m_pos - 1);
m_pos = 0;
}
else if (len > 1) {
m_listener->onLine(start, len - 1); m_listener->onLine(start, len - 1);
} }
@ -97,7 +98,5 @@ void xmrig::LineReader::getline(char *data, size_t size)
return reset(); return reset();
} }
if (!m_buf || m_buf != data) { add(start, remaining);
add(start, remaining);
}
} }