From fe862c5ad4bdce6bcc3bf8712d9472561b270c02 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Mon, 26 Jun 2017 16:00:25 +0200 Subject: [PATCH] Avoid division by zero in the case of a corrupt estimates file --- src/policy/fees.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp index dcf49de5f1c..c7e57671c0e 100644 --- a/src/policy/fees.cpp +++ b/src/policy/fees.cpp @@ -180,6 +180,7 @@ TxConfirmStats::TxConfirmStats(const std::vector& 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;