diff -r 3256212fc81f -r 826b40dcb0a8 persistentstorage/sql/TEST/t_sqlperformance4.cpp --- a/persistentstorage/sql/TEST/t_sqlperformance4.cpp Wed Aug 18 11:30:17 2010 +0300 +++ b/persistentstorage/sql/TEST/t_sqlperformance4.cpp Thu Sep 02 22:18:45 2010 +0300 @@ -9,6 +9,7 @@ // Nokia Corporation - initial contribution. // // Contributors: +// NTT DOCOMO, INC - Fix for Bug 3170 "SQL library test T_SQLPERFORMANCE4 fails with USER 84 panic" // // Description: // @@ -300,7 +301,12 @@ { break;//No more SQL statements } - TPtrC8 sqlStmt8(sql.Ptr(), eolPos - 1);//"eolPos - 1" - to cut off the '\r' character + TInt stmtLength = eolPos; + while (stmtLength > 0 && (sql[stmtLength-1] == '\r')) + { + --stmtLength; //Reduce length to remove carriage return characters from the end of the statement string + } + TPtrC8 sqlStmt8(sql.Ptr(), stmtLength); TPtrC8 ptr = sql.Mid(eolPos + 1);//"eolPos + 1" - first character after '\n' sql.Set(const_cast (ptr.Ptr()), ptr.Length(), ptr.Length()); ++recordCount;