1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-36168 ASAN error in Item_func_latlongfromgeohash::decode_geohash (postfix)

Browse Source 
pppc64le, aarch64, and s390x have char defined as unsigned so
a < 0 comparison is a compile error. The CHAR_MIN defined in limits.h
is 0 on these platforms, false, meaning the if condition is only on
signed char platforms.

To make the interface cleaner we return true on out == 255 to simplify
the calling function.
This commit is contained in:
Daniel Black 2025-04-29 17:00:32 +10:00 committed by Dave Gosselin
parent 36dfe08672
commit 068fc787ee
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sql/item_geofunc.cc
View File

@ -3035,12 +3035,19 @@ const uint8_t Item_func_latlongfromgeohash::geohash_alphabet[256] = {
}; };
/**
converts a geohash character to an int.
@return false on success, true on valid (invalid geohash character)
*/
bool Item_func_latlongfromgeohash::convert_character(char in, int &out) bool Item_func_latlongfromgeohash::convert_character(char in, int &out)
{ {
#if CHAR_MIN
/* representing signed char, unsigned char always has a map */
if (in < 0) if (in < 0)
return true; return true;
#endif
out= Item_func_latlongfromgeohash::geohash_alphabet[(int) in]; out= Item_func_latlongfromgeohash::geohash_alphabet[(int) in];
return false; return out == 255;
} }
@ -3071,10 +3078,8 @@ bool Item_func_latlongfromgeohash::decode_geohash(
for (uint i = 0; i < input_length; i++) for (uint i = 0; i < input_length; i++)
{ {
int converted_character= -1; int converted_character= -1;
if (convert_character((*geohash)[i], converted_character) || if (convert_character((*geohash)[i], converted_character))
converted_character == 255) {
return true; return true;
}
for (int bit_number = 4; bit_number >= 0; bit_number--) for (int bit_number = 4; bit_number >= 0; bit_number--)
{ {