It's perfectly safe to delete NULL pointers, so simplify things by removing these checks.tags/v1.11.90
@@ -32,10 +32,8 @@ CSecurityStack::CSecurityStack(CConnection* cc, int Type, const char* Name, | |||
CSecurityStack::~CSecurityStack() | |||
{ | |||
if (state0) | |||
delete state0; | |||
if (state1) | |||
delete state1; | |||
delete state0; | |||
delete state1; | |||
} | |||
bool CSecurityStack::processMsg() |
@@ -55,8 +55,7 @@ CSecurityVeNCrypt::CSecurityVeNCrypt(CConnection* cc, SecurityClient* sec) | |||
CSecurityVeNCrypt::~CSecurityVeNCrypt() | |||
{ | |||
if (availableTypes) | |||
delete[] availableTypes; | |||
delete[] availableTypes; | |||
} | |||
bool CSecurityVeNCrypt::processMsg() |
@@ -28,10 +28,8 @@ SSecurityStack::SSecurityStack(SConnection* sc, int Type, | |||
SSecurityStack::~SSecurityStack() | |||
{ | |||
if (state0) | |||
delete state0; | |||
if (state1) | |||
delete state1; | |||
delete state0; | |||
delete state1; | |||
} | |||
bool SSecurityStack::processMsg() |
@@ -57,11 +57,7 @@ SSecurityVeNCrypt::SSecurityVeNCrypt(SConnection* sc, SecurityServer *sec) | |||
SSecurityVeNCrypt::~SSecurityVeNCrypt() | |||
{ | |||
delete ssecurity; | |||
if (subTypes) { | |||
delete [] subTypes; | |||
subTypes = NULL; | |||
} | |||
delete [] subTypes; | |||
} | |||
bool SSecurityVeNCrypt::processMsg() |