--- a/xml/legacyminidomparser/XMLParser/SRC/GMXMLFileDataSource.cpp	Tue Apr 27 18:31:15 2010 +0300
+++ b/xml/legacyminidomparser/XMLParser/SRC/GMXMLFileDataSource.cpp	Tue May 11 17:54:43 2010 +0300
@@ -89,7 +89,7 @@
 	User::LeaveIfError(iXMLFile.Size(fileSize));
 
 	// make buffer
-	iXMLFileBuffer = HBufC8::NewLC(fileSize);
+	iXMLFileBuffer = HBufC8::NewL(fileSize);
 	TPtr8 tmpbuffer(iXMLFileBuffer->Des());
 
 	// read file into buffer
@@ -98,7 +98,6 @@
 
 	iXMLFile.Close();
 
-	CleanupStack::Pop();	// memory buffer
 	}
 
 void CMDXMLParserFileDataSource::GetData(TPtrC8 &aPtr, TRequestStatus &aStatus)

--- a/xml/xmlfw/src/xmlframework/matchdata.cpp	Tue Apr 27 18:31:15 2010 +0300
+++ b/xml/xmlfw/src/xmlframework/matchdata.cpp	Tue May 11 17:54:43 2010 +0300
@@ -800,6 +800,12 @@
 CMatchData& CMatchData::operator=(const CMatchData & aMatchData)
 	{
 
+	 /*If pointing to same. Then return itself*/
+	 if ( &aMatchData ==  this )
+	 {
+		 return *this;
+	 }
+
 	 /*
 	  * SYMBIAN DEF132492 FIX : Added TRAP statements to handle	the case wherein the functions
 	  * called here leave.