Skip to content

Commit

Permalink
Fix padding of UNICODE_FSS - complement to CORE-3431 (UTF-8) fix.
Browse files Browse the repository at this point in the history
Hope this does not cause a lot of ISQL-based tests to fail.
  • Loading branch information
asfernandes committed Oct 3, 2014
1 parent 5baa5ac commit aec3fb1
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/isql/isql.epp
Expand Up @@ -8199,18 +8199,22 @@ static unsigned process_message_display(Firebird::IMessageMetadata* message, uns
alignment = 1;
data_length++;
// OCTETS data is displayed in hex
if (var.charSet == 1)
if (var.charSet == CS_BINARY)
disp_length = 2 * var.length;
else if (var.charSet == 4)
else if (var.charSet == CS_UNICODE_FSS)
disp_length /= 3;
else if (var.charSet == CS_UTF8)
disp_length /= 4;
break;
case SQL_VARYING:
data_length += sizeof(USHORT) + 1;
alignment = sizeof(USHORT);
// OCTETS data is displayed in hex
if (var.charSet == 1)
if (var.charSet == CS_BINARY)
disp_length = 2 * var.length;
else if (var.charSet == 4)
else if (var.charSet == CS_UNICODE_FSS)
disp_length /= 3;
else if (var.charSet == CS_UTF8)
disp_length /= 4;
break;
case SQL_SHORT:
Expand Down

0 comments on commit aec3fb1

Please sign in to comment.