--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp	Tue Aug 31 16:06:03 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp	Wed Sep 01 12:28:47 2010 +0100
@@ -160,7 +160,7 @@
 	else
 		{
 		const CLiwMap* outmap = ret_val->Value().AsMap();
-		const CLiwList* drvlist;
+		const CLiwList* drvlist = NULL;
 		TLiwVariant variant_drvlist;
 		
 		if( outmap->FindL(KDriveList,variant_drvlist) )
@@ -251,7 +251,7 @@
 	else
 		{
 		const CLiwMap* outmap = ret_val->Value().AsMap();
-		const CLiwList* drvlist;
+		const CLiwList* drvlist = NULL;
 		TLiwVariant variant_drvlist;
 		
 		if( outmap->FindL(KDriveList,variant_drvlist) )
@@ -2718,9 +2718,9 @@
         interface->Close();
 
         CleanupStack::PopAndDestroy(iServiceHandler);
-
+        __UHEAP_MARKEND;
         return result;
-        __UHEAP_MARKEND;
+
         }
     else
         {
@@ -3015,10 +3015,10 @@
 	interface->Close();
 	
 	CleanupStack::PopAndDestroy( iServiceHandler );
-	
+	__UHEAP_MARKEND;	
 	return result;	
 	
-	__UHEAP_MARKEND;
+
 
 
 	}
@@ -3324,7 +3324,7 @@
 //
 TInt Ctsysinfoprovidertests::GetCameraInfoTest(CStifItemParser& aItem)
     {
-    TInt retcode;
+    TInt retcode = 0;
     iLog->Log(_L("GetCameraInfoTest - Positive Test") );
 
     __UHEAP_MARK;