GOSTSec/poolserver
1
0
Fork 0
mirror of https://github.com/GOSTSec/poolserver synced 2025-01-15 01:00:10 +00:00
Code Issues Releases Wiki Activity

Fix crash

Browse Source
This commit is contained in:
Intel 2014-05-08 10:00:11 -04:00
parent 1bb85e8d5d
commit 41e73f3d94
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/poolserver/Stratum/Client.cpp
View File

@ -39,6 +39,9 @@ namespace Stratum
_jobs[jobid] = job; _jobs[jobid] = job;
std::stringstream jobss;
jobss << std::hex << jobid;
// Build merkle branch array // Build merkle branch array
JSON merkle_branch(JSON_ARRAY); JSON merkle_branch(JSON_ARRAY);
uint64 branches = job.block->merkleBranches; uint64 branches = job.block->merkleBranches;
@ -57,7 +60,7 @@ namespace Stratum
prevhashfixed << prevhash[0] << prevhash[1] << prevhash[2] << prevhash[3] << prevhash[4] << prevhash[5] << prevhash[6] << prevhash[7]; prevhashfixed << prevhash[0] << prevhash[1] << prevhash[2] << prevhash[3] << prevhash[4] << prevhash[5] << prevhash[6] << prevhash[7];
JSON params; JSON params;
params.Add(Util::BinToASCII(ByteBuffer(jobid).Binary())); params.Add(jobss.str());
params.Add(Util::BinToASCII(prevhashfixed.Binary())); params.Add(Util::BinToASCII(prevhashfixed.Binary()));
params.Add(Util::BinToASCII(job.coinbase1)); params.Add(Util::BinToASCII(job.coinbase1));
params.Add(Util::BinToASCII(job.coinbase2)); params.Add(Util::BinToASCII(job.coinbase2));
@ -94,8 +97,9 @@ namespace Stratum
} }
uint32 jobid; uint32 jobid;
ByteBuffer jobbuf(Util::ASCIIToBin(params[1].GetString())); std::stringstream jobss;
jobbuf >> jobid; jobss << std::hex << params[1].GetString();
jobss >> jobid;
// Check if such job exists // Check if such job exists
if (!_jobs.count(jobid)) { if (!_jobs.count(jobid)) {

2
src/server/shared/Util.cpp
View File

@ -86,7 +86,7 @@ uint8 Util::ASCIIToHex(char ch)
BinaryData Util::ASCIIToBin(std::string str) BinaryData Util::ASCIIToBin(std::string str)
{ {
BinaryData data; BinaryData data;
data.resize(str.size()/2, 0); data.resize((str.size()+1)/2, 0);
for (uint64 i = 0; i < str.size(); ++i) { for (uint64 i = 0; i < str.size(); ++i) {
if (i%2) if (i%2)
data[i/2] += ASCIIToHex(str[i]); data[i/2] += ASCIIToHex(str[i]);