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

equal deleted inserted replaced

-:d6ef85bc5971
+:a7ba600cb39d
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
 //
 // Contributors:
-// NTT DOCOMO, INC - Fix for defect 1915 "SQL server panics when using long column type strings"
+// NTT DOCOMO, INC - Fix for Bug 1915 "SQL server panics when using long column type strings"
 //
 // Description:
 //
 #include "SqlSrvMain.h"			//CSqlServer
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////          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())
 @param aMessage The client request wrapped in an IPC message
 @return The blob stream handle
 @leave KErrNoMemory, 		 An out of memory condition has occurred;
-	   KErrArgument, 		 The IPC data buffer length is invalid, or the ROWID is invalid,
+	   KErrArgument, 		 The ROWID is invalid or UTF-16 to UTF-8 string conversion failed;
-	   				 		 or UTF-16 to UTF-8 string conversion failed;
 	   KErrBadDescriptor 	 The transferred data is bigger than the specified length;
 	   KErrBadName,	 		 The table name, column name or database name has an invalid length;
 KErrPermissionDenied, The client does not have the required security capabilites for this operation;
 						 Note that the function may also leave with some other system wide errors or
 		 database specific errors categorised as ESqlDbError.
-@panic SqlDb 2 Client panic. The database object is not yet created (iDatabase is NULL)
+@panic SqlDb 2 Client panic. The database object is not yet created (iDatabase is NULL).
-@panic SqlDb 3 Client panic. Failed to create a blob stream handle
+@panic SqlDb 3 Client panic. Failed to create a blob stream handle.
+@panic SqlDb 4 Client panic. IPC buffer length is 0.
 Usage of the IPC call arguments:
 Arg 0: [in]	    The length of the IPC data buffer
 Arg 1: [in]	    IPC data buffer containing blob parameters: table name, column name, rowid, mode, database name.
 Arg 2: [out]	IPC buffer containing the blob stream handle
 */
 TInt CSqlSrvSession::DbBlobSourceL(const RMessage2& aMessage)
 	{
 	__SQLPANIC_CLIENT(iDatabase != NULL, aMessage, ESqlPanicInvalidObj);
+	TInt ipcPrmLen = aMessage.Int0();
+	__SQLPANIC_CLIENT(ipcPrmLen > 0, aMessage, ESqlPanicBadArgument);
 	iIpcStreams.AllocL();
-	TInt ipcPrmLen = aMessage.Int0();
-	if(ipcPrmLen < 1)
-		{
-		__SQLLEAVE(KErrArgument);
-		}
 	TDes8& ipcPrmDes = ReadString8ZL(aMessage, 1, ipcPrmLen);
 	RDesReadStream strm(ipcPrmDes);
 	TBuf8<KMaxFileName + 1> tblName;
 	ExtractNameL(strm, tblName);
 /**
 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.

changeset 22	a7ba600cb39d
parent 17	55f2396f6d25
child 31	ba1c4f4a893f