Skip to content

Commit b109a1c

Browse files
Remove redundant nullptr checks before deallocation
Rationale: * delete ptr is a no-op if ptr is nullptr
1 parent 140de14 commit b109a1c

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

src/net.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2753,8 +2753,7 @@ CNode::~CNode()
27532753
{
27542754
CloseSocket(hSocket);
27552755

2756-
if (pfilter)
2757-
delete pfilter;
2756+
delete pfilter;
27582757
}
27592758

27602759
void CNode::AskFor(const CInv& inv)

src/qt/paymentrequestplus.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
194194
qWarning() << "PaymentRequestPlus::getMerchant: SSL error: " << err.what();
195195
}
196196

197-
if (website)
198-
delete[] website;
197+
delete[] website;
199198
X509_STORE_CTX_free(store_ctx);
200199
for (unsigned int i = 0; i < certs.size(); i++)
201200
X509_free(certs[i]);

src/qt/paymentserver.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,7 @@ void PaymentServer::initNetManager()
364364
{
365365
if (!optionsModel)
366366
return;
367-
if (netManager != nullptr)
368-
delete netManager;
367+
delete netManager;
369368

370369
// netManager is used to fetch paymentrequests given in bitcoin: URIs
371370
netManager = new QNetworkAccessManager(this);

0 commit comments

Comments
 (0)