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:
commit
6ab0e4cf49
1 changed files with 4 additions and 0 deletions
|
@ -180,6 +180,7 @@ TxConfirmStats::TxConfirmStats(const std::vector<double>& defaultBuckets,
|
|||
: buckets(defaultBuckets), bucketMap(defaultBucketMap)
|
||||
{
|
||||
decay = _decay;
|
||||
assert(_scale != 0 && "_scale must be non-zero");
|
||||
scale = _scale;
|
||||
confAvg.resize(maxPeriods);
|
||||
for (unsigned int i = 0; i < maxPeriods; i++) {
|
||||
|
@ -418,6 +419,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)");
|
||||
}
|
||||
filein >> scale;
|
||||
if (scale == 0) {
|
||||
throw std::runtime_error("Corrupt estimates file. Scale must be non-zero");
|
||||
}
|
||||
}
|
||||
|
||||
filein >> avg;
|
||||
|
|
Loading…
Reference in a new issue