DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #713 from jl777/jl777

Browse Source 
Jl777
This commit is contained in:
jl777
2018-06-28 05:31:10 -11:00
committed by GitHub
parent 4c4f1807ad 3092580a77
commit 9fe465ebec
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cc/eval.h
View File

@@ -129,14 +129,16 @@ public:
uint256 blockHash = uint256(); uint256 blockHash = uint256();
uint32_t height = 0; uint32_t height = 0;
uint256 txHash = uint256(); uint256 txHash = uint256();
char symbol[64] = "\0"; char symbol[64];
uint256 MoM = uint256(); uint256 MoM = uint256();
uint16_t MoMDepth = 0; uint16_t MoMDepth = 0;
uint16_t ccId = 0; uint16_t ccId = 0;
uint256 MoMoM = uint256(); uint256 MoMoM = uint256();
uint32_t MoMoMDepth = 0; uint32_t MoMoMDepth = 0;
NotarisationData(int IsBack=2) : IsBackNotarisation(IsBack) {} NotarisationData(int IsBack=2) : IsBackNotarisation(IsBack) {
symbol[0] = '\0';
}
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
@@ -171,7 +173,8 @@ public:
template <typename Stream> template <typename Stream>
void SerSymbol(Stream& s, CSerActionUnserialize act) void SerSymbol(Stream& s, CSerActionUnserialize act)
{ {
char *nullPos = (char*) memchr(&s[0], 0, s.size()); size_t readlen = std::min(sizeof(symbol), s.size());
char *nullPos = (char*) memchr(&s[0], 0, readlen);
if (!nullPos) if (!nullPos)
throw std::ios_base::failure("couldn't parse symbol"); throw std::ios_base::failure("couldn't parse symbol");
s.read(symbol, nullPos-&s[0]+1); s.read(symbol, nullPos-&s[0]+1);