hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1216: Correct CHAR(n) handling

Browse Source 
The field length was wrongly compared to less than 255 for two byte field
lengths. In addition to that, the metadata was interpreted in the wrong
way.
This commit is contained in:
Markus Mäkelä
2017-05-12 11:25:48 +03:00
parent 30bd869f1c
commit da2f7b1efe
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/modules/routing/avro/avro_rbr.c
View File

@ -572,15 +572,23 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
* one or two bytes for string length. * one or two bytes for string length.
*/ */
uint8_t bytes = *ptr++; uint16_t meta = metadata[metadata_offset + 1] + (metadata[metadata_offset] << 8);
int len = metadata[metadata_offset] + int bytes = 0;
(((metadata[metadata_offset + 1] >> 4) & 0x3) ^ 0x3); uint16_t extra_length = (((meta >> 4) & 0x300) ^ 0x300);
uint16_t field_length = (meta & 0xff) + extra_length;
if (len <= 255) if (field_length > 255)
{ {
bytes += *ptr++ << 8; bytes = ptr[0] + (ptr[1] << 8);
ptr += 2;
}
else
{
bytes = *ptr++;
} }
MXS_INFO("[%ld] CHAR: field: %d bytes, data: %d bytes", i, field_length, bytes);
ss_dassert(bytes || *ptr == '\0');
char str[bytes + 1]; char str[bytes + 1];
memcpy(str, ptr, bytes); memcpy(str, ptr, bytes);
str[bytes] = '\0'; str[bytes] = '\0';