secureswitools/swisistools/source/rscparser/aplapplistitem.cpp
changeset 60 245df5276b97
parent 25 98b66e4fb0be
--- a/secureswitools/swisistools/source/rscparser/aplapplistitem.cpp	Tue Jul 06 14:23:31 2010 +0300
+++ b/secureswitools/swisistools/source/rscparser/aplapplistitem.cpp	Wed Aug 18 09:55:45 2010 +0300
@@ -226,6 +226,7 @@
 
 		// read LTEXT caption
 		PtrC16* viewCaption = aResourceReader.ReadTPtrCL();
+
 		if(NULL != viewCaption)
 		{
 			viewData->SetCaptionL(viewCaption);
@@ -239,9 +240,10 @@
 
 		// read LTEXT icon_file
 		PtrC16* viewIconFile = aResourceReader.ReadTPtrCL();
+
 		if(NULL != viewIconFile)
 		{
-
+			ConvertToPlatformSpecificPath(viewIconFile->iPtr, viewIconFile->iMaxLength);
 			Ptr16*	fullViewIconFileName = ViewDataIconFileNameL(viewIconFile);
 			if (fullViewIconFileName)
 			{
@@ -287,12 +289,17 @@
 	 * aIconFileName will be returned since it is a valid string. 
 	 */	
 	ParsePtrC parsePtr(aIconFileName);
-	if (parsePtr.IsWild() || !parsePtr.PathPresent() || !parsePtr.NamePresent())
+
+	if ( parsePtr.IsWild() || !parsePtr.PathPresent() || !parsePtr.NamePresent() )
+	{
+		parsePtr.SetToNull();
 		return NULL;
+	}
 
 	filename = new Ptr16(aIconFileName->iMaxLength);
 	if(NULL==filename || NULL == filename->GetPtr())
 	{
+		parsePtr.SetToNull();
 		std::string errMsg= "Failed : Error in Reading File. Memory Allocation Failed";
 		throw CResourceFileException(errMsg);
 	}