--- a/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/EapTlsPeapCertInterface.cpp	Fri Feb 19 22:53:42 2010 +0200
+++ b/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/EapTlsPeapCertInterface.cpp	Mon Mar 15 12:40:54 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 42 %
+* %version: 43 %
 */
 
 // This is enumeration of EAPOL source code.
@@ -143,7 +143,10 @@
 	delete iSignature;
 	delete iPtrOut;
 	delete iSignaturePtr;
-	
+	delete iRSASignature;
+	delete iDSASignature;
+	delete iKeyFilter;
+		
 	iFs.Close();	
 	
 	EAP_TRACE_DEBUG(
@@ -2312,6 +2315,9 @@
 				iParent->complete_sign(R, reinterpret_cast<const RInteger&>(iRSASignature->S()), eap_status_ok);
 				
 				CleanupStack::PopAndDestroy();
+
+				delete iRSASignature;
+				iRSASignature = 0;
 				
 				iRSASigner->Release(); // This seems to be needed.
 			}
@@ -2319,6 +2325,9 @@
 			{
 				iParent->complete_sign(reinterpret_cast<const RInteger&>(iDSASignature->R()), 
 					reinterpret_cast<const RInteger&>(iDSASignature->S()), eap_status_ok);
+
+				delete iDSASignature;
+				iDSASignature = 0;
 				
 				iDSASigner->Release(); // This seems to be needed.
 			}			

--- a/wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsUiPanic.h	Fri Feb 19 22:53:42 2010 +0200
+++ b/wlansecuritysettings/wepsecuritysettingsui/inc/WEPSecuritySettingsUiPanic.h	Mon Mar 15 12:40:54 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: tr1cfwln#8 %
+* %version: tr1cfwln#9 %
 */
 
 #ifndef WEPSECURITYSETTINGSUIPANIC_H
@@ -30,7 +30,8 @@
 enum TWepSecuritySettingsPanicCodes
 	{
     EUnknownCase,
-    ETableNotFound
+    ETableNotFound,
+    EGeneral
 	};
 
 

--- a/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsDlg.cpp	Fri Feb 19 22:53:42 2010 +0200
+++ b/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsDlg.cpp	Mon Mar 15 12:40:54 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: tr1cfwln#8.1.22 %
+* %version: tr1cfwln#8.1.23 %
 */
 
 // INCLUDE FILES
@@ -444,7 +444,10 @@
         {
         iNaviDecoratorEmpty = iNaviPane->CreateNavigationLabelL( KEmpty );
         }
-
+    if ( !iNaviDecoratorEmpty )
+        {    
+         	__ASSERT_DEBUG( EFalse, Panic( EGeneral ) );
+        }
     if ( !iNaviDecoratorTabbed )
         {
         iNaviDecoratorTabbed = iNaviPane->CreateTabGroupL();
@@ -483,8 +486,11 @@
                 
             iTabGroup->SetObserver( this );
             }
+        else 
+          	{
+          	__ASSERT_DEBUG( EFalse, Panic( EGeneral ) );
+           	}
         }
-
     iNaviPane->PushL( *iNaviDecoratorEmpty );
     iList = STATIC_CAST( CAknSettingStyleListBox*, 
                                         Control( KWepMainSettingsListboxId ) );