--- a/omacpadapters/accesspointadapter/Src/CWPAPNapdef.cpp	Fri Sep 17 19:58:05 2010 +0530
+++ b/omacpadapters/accesspointadapter/Src/CWPAPNapdef.cpp	Fri Oct 15 11:39:02 2010 +0530
@@ -23,7 +23,6 @@
 #include "CWPAPNapdef.h"
 #include <CWPCharacteristic.h>
 #include <CWPParameter.h>
-#include <wpapadapterresource.rsg>
 #include <featmgr.h>
 #include <WPAdapterUtil.h>
 #include "CWPAPAccesspointItem.h"
@@ -612,16 +611,20 @@
 			    if(aCharacteristic.Name().Compare( KEAP ) == 0)
 			        {
                     CEapTypeElement* newEap = new (ELeave) CEapTypeElement;
+                    CleanupStack::PushL( newEap );
                     newEap->iEAPSettings = new (ELeave) EAPSettings;
                	    newEap->iCertificate = new (ELeave) EapCertificateEntry;
                     iEapTypeArray.AppendL(newEap);
+                    CleanupStack::Pop(newEap);
 			        }
 			    else if(aCharacteristic.Name().Compare( SECSSID ) == 0)
 			        {
                     SECssID* newsecSSID = new (ELeave) SECssID;
+                    CleanupStack::PushL( newsecSSID );
                     newsecSSID->iSSSID = NULL;
                     newsecSSID->iSUSSID = NULL;
                     iSecSSID.AppendL(newsecSSID);
+                    CleanupStack::Pop(newsecSSID);
 			        }
     
 			    aCharacteristic.AcceptL( *this );