Avoid division by zero in the case of a corrupt estimates file

pull/10672/head
practicalswift 7 years ago
parent 424be03305
commit fe862c5ad4

@ -180,6 +180,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++) {
@ -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)"); 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…
Cancel
Save