From a940e66f5ab10a2d83f385ccd708a30eafe270a9 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 9 Nov 2017 13:38:33 +0100
Subject: [PATCH] Merge #10696: Remove redundant nullptr checks before
 deallocation

b109a1c Remove redundant nullptr checks before deallocation (practicalswift)

Pull request description:

  Rationale:
  * `delete ptr` is a no-op if `ptr` is `nullptr`

Tree-SHA512: c98ce769125c4912186a8403cc08a59cfba85b7141af645c709b4c4eb90dd9cbdd6ed8076d50099d1e4ec2bf75917d1af6844082ec42bbb4d94d229a710e051c
---
 src/net.cpp                   | 3 +--
 src/qt/paymentrequestplus.cpp | 3 +--
 src/qt/paymentserver.cpp      | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 7a9cda7ca60d7..7cac430cea25f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -3229,8 +3229,7 @@ CNode::~CNode()
 {
     CloseSocket(hSocket);
 
-    if (pfilter)
-        delete pfilter;
+    delete pfilter;
 }
 
 void CNode::AskFor(const CInv& inv, int64_t doubleRequestDelay)
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
index ae76e14f5f55e..11c8d0676119e 100644
--- a/src/qt/paymentrequestplus.cpp
+++ b/src/qt/paymentrequestplus.cpp
@@ -197,8 +197,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
         qWarning() << "PaymentRequestPlus::getMerchant: SSL error: " << err.what();
     }
 
-    if (website)
-        delete[] website;
+    delete[] website;
     X509_STORE_CTX_free(store_ctx);
     for (unsigned int i = 0; i < certs.size(); i++)
         X509_free(certs[i]);
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index c5db042969d74..c281f1ab98a1c 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -366,8 +366,7 @@ void PaymentServer::initNetManager()
 {
     if (!optionsModel)
         return;
-    if (netManager != nullptr)
-        delete netManager;
+    delete netManager;
 
     // netManager is used to fetch paymentrequests given in cosanta: URIs
     netManager = new QNetworkAccessManager(this);