diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-10-12 23:49:44 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-10-12 23:55:50 +0200 |
commit | 470c730e3fa9d1120dda1de2d433304023c8aa78 (patch) | |
tree | 157f390d230eb95f1a85c02d2154afa5de02d277 /src/qt/walletview.cpp | |
parent | f74459dba6de4d4462860318f6ee5bda8522e07b (diff) | |
parent | 76fed838f381a6efba175f3650ec7e9dc73016d3 (diff) | |
download | bitcoin-470c730e3fa9d1120dda1de2d433304023c8aa78.tar.xz |
Merge #10898: Fix invalid checks (NULL checks after dereference, redundant checks, etc.)
76fed83 Avoid NULL pointer dereference when _walletModel is NULL (which is valid) (practicalswift)
4971a9a Use two boolean literals instead of re-using variable (practicalswift)
b5fb339 Remove duplicate uriParts.size() > 0 check (practicalswift)
7466991 Remove redundant check (!ecc is always true) (practicalswift)
55224af Remove redundant NULL checks after new (practicalswift)
Pull request description:
Contains:
* Remove redundant `NULL` checks after throwing `new`
* Remove redundant check (`!ecc` is always true)
* Remove duplicate `uriParts.size() > 0` check
* Use two boolean literals instead of re-using variable
Tree-SHA512: 30e9af8a9d5c8184836f8267b492aeb4e26eca171a3be08f634b3f39b3055b9fa9f06623f6c69b294ca13bf99743f7645cfac2b25e014ff74687bd085a997895
Diffstat (limited to 'src/qt/walletview.cpp')
-rw-r--r-- | src/qt/walletview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index 971f5e0e1a..a56a40037f 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -122,8 +122,8 @@ void WalletView::setWalletModel(WalletModel *_walletModel) overviewPage->setWalletModel(_walletModel); receiveCoinsPage->setModel(_walletModel); sendCoinsPage->setModel(_walletModel); - usedReceivingAddressesPage->setModel(_walletModel->getAddressTableModel()); - usedSendingAddressesPage->setModel(_walletModel->getAddressTableModel()); + usedReceivingAddressesPage->setModel(_walletModel ? _walletModel->getAddressTableModel() : nullptr); + usedSendingAddressesPage->setModel(_walletModel ? _walletModel->getAddressTableModel() : nullptr); if (_walletModel) { |