Rework on CORE-5277 to avoid CORE-5304 regression.

CORE-5277 - Parameters with multibyte character sets allow to bypass the character limit of varchar fields. CORE-5304 - Regression: Can not restore database with table contains field CHAR(n) and UTF8 character set.
FirebirdSQL · Jul 13, 2016 · 36e4fa9 · 36e4fa9
1 parent 14ca252
commit 36e4fa9
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 61 deletions.
diff --git a/src/dsql/ExprNodes.cpp b/src/dsql/ExprNodes.cpp
@@ -7918,6 +7918,55 @@ dsc* ParameterNode::execute(thread_db* tdbb, jrd_req* request) const
 
 	if (!(*impure_flags & VLU_checked))
 	{
+		if (!(request->req_flags & req_null))
+		{
+			desc = &impure->vlu_desc;
+
+			if (DTYPE_IS_TEXT(desc->dsc_dtype))
+			{
+				const UCHAR* p = desc->dsc_address;
+				USHORT maxLen = desc->dsc_length;
+				USHORT len;
+
+				switch (desc->dsc_dtype)
+				{
+					case dtype_cstring:
+						len = strnlen((const char*) p, maxLen);
+						--maxLen;
+						break;
+
+					case dtype_text:
+						len = desc->dsc_length;
+						break;
+
+					case dtype_varying:
+						len = reinterpret_cast<const vary*>(p)->vary_length;
+						p += sizeof(USHORT);
+						maxLen -= sizeof(USHORT);
+						break;
+				}
+
+				CharSet* charSet = INTL_charset_lookup(tdbb, DSC_GET_CHARSET(desc));
+
+				EngineCallbacks::instance->validateData(charSet, len, p);
+				EngineCallbacks::instance->validateLength(charSet, len, p, maxLen);
+			}
+			else if (desc->isBlob())
+			{
+				if (desc->getCharSet() != CS_NONE && desc->getCharSet() != CS_BINARY)
+				{
+					const Jrd::bid* bid = request->getImpure<Jrd::bid>(
+						message->impureOffset + (ULONG)(IPTR) desc->dsc_address);
+
+					if (!bid->isEmpty())
+					{
+						AutoBlb blob(tdbb, blb::open(tdbb, tdbb->getTransaction(), bid));
+						blob.getBlb()->BLB_check_well_formed(tdbb, desc);
+					}
+				}
+			}
+		}
+
 		if (argInfo)
 		{
 			EVL_validate(tdbb, Item(Item::TYPE_PARAMETER, message->messageNumber, argNumber),

diff --git a/src/jrd/cvt.cpp b/src/jrd/cvt.cpp
@@ -419,17 +419,17 @@ void EngineCallbacks::validateData(CharSet* toCharSet, SLONG length, const UCHAR
 void EngineCallbacks::validateLength(CharSet* toCharSet, SLONG toLength, const UCHAR* start,
 	const USHORT to_size)
 {
-	if (toCharSet)
+	if (toCharSet &&
+		toCharSet->isMultiByte() &&
+		!(toCharSet->getFlags() & CHARSET_LEGACY_SEMANTICS))
 	{
 		Jrd::thread_db* tdbb = NULL;
 		SET_TDBB(tdbb);
 
 		const ULONG src_len = toCharSet->length(toLength, start, false);
 		const ULONG dest_len  = (ULONG) to_size / toCharSet->maxBytesPerChar();
 
-		if (toCharSet->isMultiByte() &&
-			!(toCharSet->getFlags() & CHARSET_LEGACY_SEMANTICS) &&
-			src_len > dest_len)
+		if (src_len > dest_len)
 		{
 			err(Arg::Gds(isc_arith_except) << Arg::Gds(isc_string_truncation) <<
 				Arg::Gds(isc_trunc_limits) << Arg::Num(dest_len) << Arg::Num(src_len));

diff --git a/src/jrd/exe.cpp b/src/jrd/exe.cpp
@@ -792,63 +792,6 @@ void EXE_send(thread_db* tdbb, jrd_req* request, USHORT msg, ULONG length, const
 
 	memcpy(request->getImpure<UCHAR>(message->impureOffset), buffer, length);
 
-	for (USHORT i = 0; i < format->fmt_count; ++i)
-	{
-		const DSC* desc = &format->fmt_desc[i];
-
-		// ASF: I'll not test for dtype_cstring because usage is only internal
-		if (desc->dsc_dtype == dtype_text || desc->dsc_dtype == dtype_varying)
-		{
-			const UCHAR* p = request->getImpure<UCHAR>(message->impureOffset +
-				(ULONG)(IPTR) desc->dsc_address);
-			USHORT descLen = desc->dsc_length;
-			USHORT len;
-
-			switch (desc->dsc_dtype)
-			{
-				case dtype_text:
-					len = desc->dsc_length;
-					break;
-
-				case dtype_varying:
-					descLen -= sizeof(USHORT);
-					len = reinterpret_cast<const vary*>(p)->vary_length;
-					p += sizeof(USHORT);
-					break;
-			}
-
-			CharSet* charSet = INTL_charset_lookup(tdbb, DSC_GET_CHARSET(desc));
-
-			if (!charSet->wellFormed(len, p))
-				ERR_post(Arg::Gds(isc_malformed_string));
-
-			const USHORT srcCharLen = charSet->length(len, p, false);
-			const USHORT dstCharLen = descLen / charSet->maxBytesPerChar();
-
-			if (srcCharLen > dstCharLen)
-			{
-				status_exception::raise(
-					Arg::Gds(isc_arith_except) <<
-					Arg::Gds(isc_string_truncation) <<
-					Arg::Gds(isc_trunc_limits) << Arg::Num(dstCharLen) << Arg::Num(srcCharLen));
-			}
-		}
-		else if (desc->isBlob())
-		{
-			if (desc->getCharSet() != CS_NONE && desc->getCharSet() != CS_BINARY)
-			{
-				const Jrd::bid* bid = request->getImpure<Jrd::bid>(
-					message->impureOffset + (ULONG)(IPTR) desc->dsc_address);
-
-				if (!bid->isEmpty())
-				{
-					AutoBlb blob(tdbb, blb::open(tdbb, transaction/*tdbb->getTransaction()*/, bid));
-					blob.getBlb()->BLB_check_well_formed(tdbb, desc);
-				}
-			}
-		}
-	}
-
 	execute_looper(tdbb, request, transaction, request->req_next, jrd_req::req_proceed);
 }