Skip to content

Commit

Permalink
Postfix for rework on CORE-5277 to avoid CORE-5304 regression (0d46c91).
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
asfernandes committed Jul 26, 2016
1 parent 5fd5021 commit 600b408
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/dsql/ExprNodes.cpp
Expand Up @@ -7920,12 +7920,12 @@ dsc* ParameterNode::execute(thread_db* tdbb, jrd_req* request) const
{
if (!(request->req_flags & req_null))
{
USHORT maxLen = desc->dsc_length; // not adjusted length
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)
Expand Down

0 comments on commit 600b408

Please sign in to comment.