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
This commit is contained in:
commit
ef3758d1ef
3 changed files with 3 additions and 6 deletions
|
@ -2778,8 +2778,7 @@ CNode::~CNode()
|
|||
{
|
||||
CloseSocket(hSocket);
|
||||
|
||||
if (pfilter)
|
||||
delete pfilter;
|
||||
delete pfilter;
|
||||
}
|
||||
|
||||
void CNode::AskFor(const CInv& inv)
|
||||
|
|
|
@ -194,8 +194,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]);
|
||||
|
|
|
@ -362,8 +362,7 @@ void PaymentServer::initNetManager()
|
|||
{
|
||||
if (!optionsModel)
|
||||
return;
|
||||
if (netManager != nullptr)
|
||||
delete netManager;
|
||||
delete netManager;
|
||||
|
||||
// netManager is used to fetch paymentrequests given in bitcoin: URIs
|
||||
netManager = new QNetworkAccessManager(this);
|
||||
|
|
Loading…
Reference in a new issue