--- a/egl/egltest/endpointtestsuite/automated/src/localtestbase.cpp	Tue Jul 20 13:27:44 2010 +0300
+++ b/egl/egltest/endpointtestsuite/automated/src/localtestbase.cpp	Fri Jul 30 11:41:40 2010 +0300
@@ -71,6 +71,7 @@
     
     DoPostambleL();
     delete iResultLog;
+    iResultLog = NULL;
     iResultOutQueue.Close();
     iParamsInQueue.Close();
     return EPass;
@@ -405,7 +406,8 @@
 
 void CTestIdResultLogger::LogResult(TVerdict aVerdict)
     {
-    TBuf<20> verdict;
+    const TInt KMaxVerdictLength = 20;
+    TBuf<KMaxVerdictLength> verdict;
     switch(aVerdict)
         {
         case EPass:           verdict.Append(_L("PASS"));            break;
@@ -432,24 +434,21 @@
 
 TInt CTestIdResultLogger::PanicMonitorMain(TAny* aSelf)
     {
+    CTestIdResultLogger* self = static_cast<CTestIdResultLogger*>(aSelf);
+    
+    //Create cleanup stack.
     CTrapCleanup* cleanup = CTrapCleanup::New();
-
-    TRAPD(err,
-        //Create active scheduler.
-        CActiveScheduler* scheduler = new (ELeave) CActiveScheduler();
-        CleanupStack::PushL(scheduler);
-        CActiveScheduler::Install(scheduler);
-
-        //Run MainL.
-        CTestIdResultLogger* self = static_cast<CTestIdResultLogger*>(aSelf);
-        self->PanicMonitorMainL();
-
-        //Clean up.
-        CleanupStack::PopAndDestroy(scheduler);
-        );
+    ASSERT(cleanup);
     
+    //Create active scheduler.
+    CActiveScheduler* scheduler = new CActiveScheduler();
+    ASSERT(scheduler);
+    CActiveScheduler::Install(scheduler);
+    
+    TRAPD(err,  self->PanicMonitorMainL());
     __ASSERT_ALWAYS(err == KErrNone, User::Invariant());
-
+    
+    delete scheduler;
     delete cleanup;
     return KErrNone;
     }
@@ -541,7 +540,7 @@
 	{
 	__UHEAP_MARK;
 	CTrapCleanup* cleanup = CTrapCleanup::New();
-	if(cleanup == NULL)
+	if(!cleanup)
 		{
 		return KErrNoMemory;
 		}