mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Fixed bug mdev-4373:
Valgrind complained on usage of uninitialized memory.
This commit is contained in:
12
sql/field.cc
12
sql/field.cc
@@ -6202,14 +6202,16 @@ double Field_str::middle_point_pos(Field *min, Field *max)
|
||||
uchar minp_prefix[sizeof(ulonglong)];
|
||||
uchar maxp_prefix[sizeof(ulonglong)];
|
||||
ulonglong mp, minp, maxp;
|
||||
uint dsz= min(field_length, sizeof(ulonglong) * charset()->mbmaxlen);
|
||||
memset(mp_prefix, 0, sizeof(ulonglong));
|
||||
memset(minp_prefix, 0, sizeof(ulonglong));
|
||||
memset(maxp_prefix, 0, sizeof(ulonglong));
|
||||
my_strnxfrm(charset(), mp_prefix, sizeof(mp),
|
||||
ptr + length_size(), sizeof(mp) * charset()->mbmaxlen);
|
||||
ptr + length_size(), dsz);
|
||||
my_strnxfrm(charset(), minp_prefix, sizeof(minp),
|
||||
min->ptr + length_size(),
|
||||
sizeof(minp) * charset()->mbmaxlen);
|
||||
min->ptr + length_size(), dsz);
|
||||
my_strnxfrm(charset(), maxp_prefix, sizeof(maxp),
|
||||
max->ptr + length_size(),
|
||||
sizeof(maxp) * charset()->mbmaxlen);
|
||||
max->ptr + length_size(), dsz);
|
||||
mp= char_prefix_to_ulonglong(mp_prefix);
|
||||
minp= char_prefix_to_ulonglong(minp_prefix);
|
||||
maxp= char_prefix_to_ulonglong(maxp_prefix);
|
||||
|
Reference in New Issue
Block a user