MCL/sf/os/persistentdata: comparison persistentstorage/sql/SRC/Server/SqlSrvSession.cpp

equal deleted inserted replaced

-:31a8f755b7fe
+:211563e4b919
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
 //
 // Contributors:
+// NTT DOCOMO, INC - Fix for Bug 1915 "SQL server panics when using long column type strings"
 //
 // Description:
 //
 #include "SqlSrvMain.h"			//CSqlServer
 #include "SqlCompact.h"
 #include "UTraceSql.h"
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma BullseyeCoverage off
 #ifdef _DEBUG
 const TInt KDelayedDbHeapFailureMask = 0x1000;
 //Puts the database connection in a test mode
 	}
 //Executes the heap simulation failure.
 inline void CSqlSrvSession::DbSetAllocFail(TInt aHeapFailureMode, TInt aFailedAllocNumber)
 	{
-	User::__DbgSetAllocFail(RHeap::EUser,
+	TInt mode = aHeapFailureMode & (KDelayedDbHeapFailureMask - 1);
-							static_cast <RHeap::TAllocFail> (aHeapFailureMode & (KDelayedDbHeapFailureMask - 1)),
+	if(mode >= RAllocator::EBurstRandom && mode <= RAllocator::EBurstFailNext)
-							aFailedAllocNumber);
+	    {
+	    const TUint KBurst = 50;
+	    User::__DbgSetBurstAllocFail(RHeap::EUser, static_cast <RHeap::TAllocFail> (mode), aFailedAllocNumber, KBurst);
+	    }
+	else
+	    {
+User::__DbgSetAllocFail(RHeap::EUser, static_cast <RHeap::TAllocFail> (mode), aFailedAllocNumber);
+	    }
 	}
 //Executes the delayed heap simulation failure, if the connection is in test mode
 inline void CSqlSrvSession::DbSetDelayedAllocFail()
 	{
 	if(iDbResourceTestMode & KDelayedDbHeapFailureMask)
 		{
-		User::__DbgSetAllocFail(RHeap::EUser,
+	    TInt mode = iDbResourceTestMode & (KDelayedDbHeapFailureMask - 1);
-								static_cast <RHeap::TAllocFail> (iDbResourceTestMode & (KDelayedDbHeapFailureMask - 1)),
+	    if(mode >= RAllocator::EBurstRandom && mode <= RAllocator::EBurstFailNext)
-								iFailedAllocNumber);
+	        {
+	        const TUint KBurst = 50;
+	        User::__DbgSetBurstAllocFail(RHeap::EUser, static_cast <RHeap::TAllocFail> (mode), iFailedAllocNumber, KBurst);
+	        }
+	    else
+	        {
+	        User::__DbgSetAllocFail(RHeap::EUser, static_cast <RHeap::TAllocFail> (mode), iFailedAllocNumber);
+	        }
 		}
 	}
 #else //_DEBUG
 inline void CSqlSrvSession::DbSetDelayedAllocFail()
 	{
 	}
 #endif//_DEBUG
+#pragma BullseyeCoverage on
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /**
 			break;
 		case ESqlSrvStmtColumnValue:
 			StmtColumnValueL(aMessage, handle);
 			break;
 		case ESqlSrvStmtDeclColumnTypes:
-			StmtDeclColumnTypesL(aMessage, handle);
+			retCode = StmtDeclColumnTypesL(aMessage, handle);
 			break;
 		//////////////////////   stream operations //////////////////////////////////
 		case ESqlSrvStreamRead:
 			retCode = ::SqlSessObjFind(iIpcStreams, handle, aMessage).ReadL(aMessage);
 			break;
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////          Profiler  operations           ///////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma BullseyeCoverage off
 /**
 Retrieves the counter values for the specified profiling counter.
 @leave  KErrNone, the operation completed successfully,
 KErrOverflow, the receiving buffer size is too small;
 	else
 		{
 		TSqlSrvResourceProfiler::QueryL(aMessage);
 		}
 	}
+#pragma BullseyeCoverage on
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////          Database operations           ///////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 Arg 1: [in]  db names buffer
 Arg 2: [in]  file session handle
 Arg 3: [in]  database file handle
 @panic SqlDb 2 Client panic. iDatabase is NULL (the database object is not created yet).
+@panic SqlDb 4 Client panic. Invalid IPC data, an indication of a problme in client side sql library.
 */
 void CSqlSrvSession::DbAttachFromHandleL(const RMessage2& aMessage)
 	{
 	__SQLPANIC_CLIENT(iDatabase != NULL, aMessage, ESqlPanicInvalidObj);
 	//Read-only flag, buffer length, buffer allocation
 	TBool readOnly = (aMessage.Int0() & 0x80000000) != 0;
 	const TInt KBufLen = aMessage.Int0() & 0x7FFFFFFF;
-	if(KBufLen <= 0)
+__SQLPANIC_CLIENT(KBufLen > 0, aMessage, ESqlPanicBadArgument);
-		{
-		__SQLLEAVE(KErrArgument);
-		}
 	HBufC8* buf = HBufC8::NewLC(KBufLen);
 	TPtr8 bufPtr = buf->Des();
 	aMessage.ReadL(1, bufPtr);
 	SQLPROFILER_REPORT_IPC(ESqlIpcRead, KBufLen);
 	if(KBufLen != bufPtr.Length())
 	SQLPROFILER_REPORT_IPC(ESqlIpcRead, prmLen);
 	aStmt.BindL(prmBuf);
 	}
 /**
+Processes the request for retrieving the statement declared column type names.
+If the client side buffer size is not big enough, the function returns the size + KSqlClientBufOverflowCode.
+In this case the client must increase the buffer and try again to get the buffer only
 Usage of the IPC call arguments:
 Arg 0: [in]    	input buffer max length in 16-bit characters
-Arg 1: [in/out]	buffer
+Arg 1: [out]	ipc buffer, declared column type names
 */
-void CSqlSrvSession::StmtDeclColumnTypesL(const RMessage2& aMessage, TInt aStmtHandle)
+TInt CSqlSrvSession::StmtDeclColumnTypesL(const RMessage2& aMessage, TInt aStmtHandle)
 	{
 	CSqlSrvStatement& stmt = ::SqlSessObjFind(iStatements, aStmtHandle, aMessage);
-	HBufC* colTypesBuf = stmt.GetDeclColumnTypesL();
+	const RSqlBufFlat& declColumnTypesBuf = stmt.GetDeclColumnTypesL();
-	CleanupStack::PushL(colTypesBuf);
+	TInt size = declColumnTypesBuf.Size();
-	if(colTypesBuf->Des().Length() > aMessage.Int0())
+	if(size <= aMessage.Int0())
 		{
-		__SQLLEAVE(KErrOverflow);
+		aMessage.WriteL(1, declColumnTypesBuf.BufDes());
-		}
+		return 0;
-	aMessage.WriteL(1, colTypesBuf->Des());
+		}
-	SQLPROFILER_REPORT_IPC(ESqlIpcWrite, (colTypesBuf->Des().Length() * sizeof(TText)));
+	return size + KSqlClientBufOverflowCode;
-	CleanupStack::PopAndDestroy(colTypesBuf);
 	}
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////              Helper methods                     /////////////////////////////////
 /**
 Reads a 8-bit string with "aByteLen" bytes length, which is in "aArgNum" argument of aMessage.
 The string will be zero terminated after the "read" operation.
 Returns TDes8 reference pointing to the zero-terminated string.
-@leave KErrBadDescriptor The transferred data length is bigger than the aByteLen value
+@panic SqlDb 3 Client panic. The string length is not equal to aByteLen. If happens then it is an indication of a
+problem inside client side sql library.
 @panic SqlDb 4 Client panic. Negative aByteLen value.
 */
 TDes8& CSqlSrvSession::ReadString8ZL(const RMessage2& aMessage, TInt aArgNum, TInt aByteLen)
 	{
 	__SQLPANIC_CLIENT(aByteLen >= 0, aMessage, ESqlPanicBadArgument);
 	TDes8& buf = Server().GetBuf8L(aByteLen + 1);
 	aMessage.ReadL(aArgNum, buf);
 	SQLPROFILER_REPORT_IPC(ESqlIpcRead, aByteLen);
-	if(buf.Length() > aByteLen)
+__SQLPANIC_CLIENT(buf.Length() == aByteLen, aMessage, ESqlPanicBadHandle);
-		{
-		__SQLLEAVE(KErrBadDescriptor);
-		}
 	buf.Append(TChar(0));
 	return buf;
 	}
 /**
 Reads a 16-bit string with "aCharLen" character length, which is in "aArgNum" argument of aMessage.
 The string will be zero terminated after the "read" operation.
 Returns TDes16 reference pointing to the zero-terminated string.
-@leave KErrBadDescriptor The transferred data length is bigger than the aCharLen value
+@panic SqlDb 3 Client panic. The string length is not equal to aCharLen. If happens then it is an indication of a
+problem inside client side sql library.
 @panic SqlDb 4 Client panic. Negative aCharLen value.
 */
 TDes16& CSqlSrvSession::ReadString16ZL(const RMessage2& aMessage, TInt aArgNum, TInt aCharLen)
 	{
 	__SQLPANIC_CLIENT(aCharLen >= 0, aMessage, ESqlPanicBadArgument);
 	TDes16& buf = Server().GetBuf16L(aCharLen + 1);
 	aMessage.ReadL(aArgNum, buf);
 	SQLPROFILER_REPORT_IPC(ESqlIpcRead, (aCharLen * sizeof(TText)));
-	if(buf.Length() > aCharLen)
+__SQLPANIC_CLIENT(buf.Length() == aCharLen, aMessage, ESqlPanicBadHandle);
-		{
-		__SQLLEAVE(KErrBadDescriptor);
-		}
 	buf.Append(TChar(0));
 	return buf;
 	}
 /**
 Reads a 16-bit string with "aCharLen" character length, which is in "aArgNum" argument of aMessage.
 Returns TDes16 reference pointing to the string.
-@leave KErrBadDescriptor The transferred data length is bigger than the aCharLen value
+@panic SqlDb 3 Client panic. The string length is not equal to aCharLen. If happens then it is an indication of a
+problem inside client side sql library.
 @panic SqlDb 4 Client panic. Negative aCharLen value.
 */
 TDes16& CSqlSrvSession::ReadString16L(const RMessage2& aMessage, TInt aArgNum, TInt aCharLen)
 	{
 	__SQLPANIC_CLIENT(aCharLen >= 0, aMessage, ESqlPanicBadArgument);
 	TDes16& buf = Server().GetBuf16L(aCharLen);
 	aMessage.ReadL(aArgNum, buf);
 	SQLPROFILER_REPORT_IPC(ESqlIpcRead, (aCharLen * sizeof(TText)));
-	if(buf.Length() > aCharLen)
+__SQLPANIC_CLIENT(buf.Length() == aCharLen, aMessage, ESqlPanicBadHandle);
-		{
-		__SQLLEAVE(KErrBadDescriptor);
-		}
 	return buf;
 	}
 /**
 The method constructs a CSqlSecurityPolicy object from the passed as an argument descriptor.
 		default:
 			{
 			TPtrC8 val;
 			if(aColType == ESqlText)
 				{
-				TPtrC textVal = aStmt.ColumnText(0);
+				TPtrC textVal = aStmt.ColumnTextL(0);
 				val.Set(reinterpret_cast <const TUint8*> (textVal.Ptr()), textVal.Length() * sizeof(TUint16));
 				}
 			else
 				{
 				val.Set(aStmt.ColumnBinary(0));

branch	RCL_3
changeset 11	211563e4b919
parent 10	31a8f755b7fe
child 12	6b6fd149daa2