Fixed extra null bytes at the end of collations
This commit is contained in:
@@ -86,16 +86,12 @@ GLibCollator::~GLibCollator() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
auto GLibCollator::Transform(const std::string& in) -> std::string {
|
auto GLibCollator::Transform(const std::string& in) -> std::string {
|
||||||
char dest[256];
|
size_t size = glib_strxfrm(NULL, in.c_str(), 0, locale_data_.get());
|
||||||
size_t size = glib_strxfrm(dest, in.c_str(), 256, locale_data_.get());
|
char* dest = new char[size + 1]{0};
|
||||||
if (size >= 256) {
|
glib_strxfrm(dest, in.c_str(), size, locale_data_.get());
|
||||||
char* larger_dest = new char[size + 1]{0};
|
std::string out{dest, strnlen(dest, size)};
|
||||||
glib_strxfrm(larger_dest, in.c_str(), size, locale_data_.get());
|
delete[] dest;
|
||||||
std::string out{larger_dest, size};
|
|
||||||
delete[] larger_dest;
|
|
||||||
return out;
|
return out;
|
||||||
}
|
|
||||||
return {dest, size};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace locale
|
} // namespace locale
|
||||||
|
|||||||
Reference in New Issue
Block a user