fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'xmrig/master' into feature_cc

Browse source
This commit is contained in:
Ben Gräf 2017-10-21 22:13:24 +02:00
commit bb09944cb8
9 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/net/Client.cpp
View file

@ -220,7 +220,8 @@ bool Client::parseJob(const rapidjson::Value &params, int *code)
}
if (m_job == job) {
LOG_WARN("[%s:%u] duplicate job received, ignore", m_url.host(), m_url.port());
LOG_WARN("[%s:%u] duplicate job received, reconnect", m_url.host(), m_url.port());
close();
return false;
}

2
src/net/JobId.h
View file

@ -63,7 +63,7 @@ public:
}
const size_t size = strlen(id);
if (size < 4 || size >= sizeof(m_data)) {
if (size >= sizeof(m_data)) {
return false;
}