aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-09-15 09:55:14 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2017-09-15 09:55:23 +0200
commit09627b1dd41d1151a709d5ead82a924bf59e3d38 (patch)
tree7d797caf8a314f716a3935cb3f4f67e223ca63c2
parentae233c4ec3d14a97c6195059f52873cdba2b4755 (diff)
parentcdaf3a1f9e93be273ebf3e470dc709828c55476c (diff)
Merge #11332: Fix possible crash with invalid nCustomFeeRadio in QSettings (achow101, TheBlueMatt)
cdaf3a1 Fix Qt 0.14.2->0.15.0 segfault if "total at least" is selected (Matt Corallo) Pull request description: `QButtonGroup->button()` may return a nullptr. Accessing the object directly with `setChecked` seems fragile. This is a simple fix to ensure to never call a button out of bounds (nullptr). There are probably other places where a sanity check for `QSettings` are required. Found by @achow101. Code by @TheBlueMatt. Tree-SHA512: a1b5d6636382a4e20c4e66ef82de19e6daa8b1b5f21b0f2bc5f51cfb6b37797045c7e29ebead8088ee2b990ed12c549c217cae6aad7566319599d086d526f6dc
-rw-r--r--src/qt/sendcoinsdialog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 05c5ccbfe2..cc7786a07b 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -128,7 +128,7 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *_platformStyle, QWidget *p
ui->groupFee->setId(ui->radioCustomFee, 1);
ui->groupFee->button((int)std::max(0, std::min(1, settings.value("nFeeRadio").toInt())))->setChecked(true);
ui->groupCustomFee->setId(ui->radioCustomPerKilobyte, 0);
- ui->groupCustomFee->button((int)std::max(0, std::min(1, settings.value("nCustomFeeRadio").toInt())))->setChecked(true);
+ ui->groupCustomFee->button(0)->setChecked(true);
ui->customFee->setValue(settings.value("nTransactionFee").toLongLong());
ui->checkBoxMinimumFee->setChecked(settings.value("fPayOnlyMinFee").toBool());
minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool());