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

Fix improper use of the metadata pointer

Browse Source 
The value was unconditionally dereferenced even if the data type did not
have metadata. In this case the pointer would point to unallocated memory
which can lead to a crash.
This commit is contained in:
Markus Mäkelä 2018-06-05 00:47:26 +03:00
parent f574703f8e
commit e9dee55245
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/mysql_binlog.cc
View File

@ -458,7 +458,7 @@ size_t unpack_bit(uint8_t *ptr, uint8_t *null_mask, uint32_t col_count,
* @param decimals How many decimals the field has
* @return Number of bytes the temporal value takes
*/
static size_t temporal_field_size(uint8_t type, uint8_t decimals, int length)
static size_t temporal_field_size(uint8_t type, uint8_t* decimals, int length)
{
switch (type)
{
@ -470,7 +470,7 @@ static size_t temporal_field_size(uint8_t type, uint8_t decimals, int length)
return 3;
case TABLE_COL_TYPE_TIME2:
return 3 + ((decimals + 1) / 2);
return 3 + ((*decimals + 1) / 2);
case TABLE_COL_TYPE_DATETIME:
return 8;
@ -479,10 +479,10 @@ static size_t temporal_field_size(uint8_t type, uint8_t decimals, int length)
return 4;
case TABLE_COL_TYPE_TIMESTAMP2:
return 4 + ((decimals + 1) / 2);
return 4 + ((*decimals + 1) / 2);
case TABLE_COL_TYPE_DATETIME2:
return 5 + ((decimals + 1) / 2);
return 5 + ((*decimals + 1) / 2);
default:
MXS_ERROR("Unknown field type: %x %s", type, column_type_to_string(type));
@ -538,7 +538,7 @@ size_t unpack_temporal_value(uint8_t type, uint8_t *ptr, uint8_t *metadata, int
ss_dassert(false);
break;
}
return temporal_field_size(type, *metadata, length);
return temporal_field_size(type, metadata, length);
}
void format_temporal_value(char *str, size_t size, uint8_t type, struct tm *tm)