mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 12:32:48 +01:00
Merge #10672: Avoid division by zero in the case of a corrupt estimates file
fe862c5ad
Avoid division by zero in the case of a corrupt estimates file (practicalswift)
Pull request description:
Avoid division by zero in the case of a corrupt estimates file.
Tree-SHA512: 285cb0d566f239d260880026a930a7412d86e31ea3819d5371a36364a241dc76164e68c1da6da8369345fa6037ca0abc5ab82d245058c085d5f1fd50111fba48
This commit is contained in:
parent
df109ec118
commit
fb2cd99f94
@ -179,6 +179,7 @@ TxConfirmStats::TxConfirmStats(const std::vector<double>& defaultBuckets,
|
|||||||
: buckets(defaultBuckets), bucketMap(defaultBucketMap)
|
: buckets(defaultBuckets), bucketMap(defaultBucketMap)
|
||||||
{
|
{
|
||||||
decay = _decay;
|
decay = _decay;
|
||||||
|
assert(_scale != 0 && "_scale must be non-zero");
|
||||||
scale = _scale;
|
scale = _scale;
|
||||||
confAvg.resize(maxPeriods);
|
confAvg.resize(maxPeriods);
|
||||||
for (unsigned int i = 0; i < maxPeriods; i++) {
|
for (unsigned int i = 0; i < maxPeriods; i++) {
|
||||||
@ -417,6 +418,9 @@ void TxConfirmStats::Read(CAutoFile& filein, int nFileVersion, size_t numBuckets
|
|||||||
throw std::runtime_error("Corrupt estimates file. Decay must be between 0 and 1 (non-inclusive)");
|
throw std::runtime_error("Corrupt estimates file. Decay must be between 0 and 1 (non-inclusive)");
|
||||||
}
|
}
|
||||||
filein >> scale;
|
filein >> scale;
|
||||||
|
if (scale == 0) {
|
||||||
|
throw std::runtime_error("Corrupt estimates file. Scale must be non-zero");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
filein >> avg;
|
filein >> avg;
|
||||||
|
Loading…
Reference in New Issue
Block a user