diff -r 425d8f4f7fa5 -r bb2423252ea3 networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp --- a/networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp Wed Sep 15 00:18:51 2010 +0300 +++ b/networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp Wed Sep 15 13:53:10 2010 +0300 @@ -140,7 +140,7 @@ CTlsCryptoAttributes* tPtr = new (ELeave)CTlsCryptoAttributes; CleanupStack::PushL(tPtr); tPtr->iPublicKeyParams = new (ELeave)CTLSPublicKeyParams; - CleanupStack::Pop(); + CleanupStack::Pop(tPtr); return tPtr; } @@ -1317,9 +1317,10 @@ case EGetSessionInterface: { - iPtrTokenSearch->CancelRequest(); + if (iPtrTokenSearch) + iPtrTokenSearch->CancelRequest(); + } break; - } case EGetCiphers: { if(iListAllTokensAndTypes[iCurrentTokentype].iProviderInterface) @@ -1371,7 +1372,8 @@ #ifdef _USESECDLGSV_ iDialogServ.Cancel(); #else - iSecurityDialog->Cancel(); + if (iSecurityDialog) + iSecurityDialog->Cancel(); #endif } break;