firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 15:23:02 +01:00
Code Issues

Fix the assertion with Thomas Beckmann test.

Browse Source
This commit is contained in:
asfernandes 2013-07-11 02:21:27 +00:00
parent 7ef5725b5f
commit 672c38b043
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jrd/DataTypeUtil.cpp
View File

@ -193,16 +193,14 @@ void DataTypeUtilBase::makeFromList(dsc* result, const char* expressionName, int
{ {
// So convert its character length to max. byte length of the destination charset. // So convert its character length to max. byte length of the destination charset.
const ULONG len = convertLength(result->dsc_length, CS_ASCII, result->getCharSet()); const ULONG len = convertLength(result->dsc_length, CS_ASCII, result->getCharSet());
fb_assert(len <= MAX_COLUMN_SIZE); // Maybe status_exception::raise?
result->dsc_length = len;
if (anyVarying) if (anyVarying)
{
// Adjust for varying, if it's the case.
fb_assert(len <= MAX_COLUMN_SIZE - sizeof(USHORT));
result->dsc_dtype = dtype_varying; result->dsc_dtype = dtype_varying;
result->dsc_length = fixLength(result, len);
if (anyVarying)
result->dsc_length += sizeof(USHORT); result->dsc_length += sizeof(USHORT);
}
} }
} }