deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-06-08 16:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clamp spell-provider length casts on Win32

Browse Source
This commit is contained in:
deepend-tildeclub
2026-05-20 14:51:06 -06:00
parent fb897310c8
commit c7064c18b9
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libenchant_win8/win8_provider.cpp
View File

@@ -26,12 +26,19 @@
#include <windows.h> #include <windows.h>
#include <cstdlib> #include <cstdlib>
#include <climits>
#include "typedef.h" // for ssize_t #include "typedef.h" // for ssize_t
#include <enchant-provider.h> #include <enchant-provider.h>
ENCHANT_PLUGIN_DECLARE ("win8") ENCHANT_PLUGIN_DECLARE ("win8")
static int
size_to_int (size_t value)
{
return value > static_cast<size_t>(INT_MAX) ? INT_MAX : static_cast<int>(value);
}
static char * static char *
utf16_to_utf8 (const wchar_t * const str, bool from_bcp47) utf16_to_utf8 (const wchar_t * const str, bool from_bcp47)
{ {
@@ -136,7 +143,7 @@ static void
win8_dict_add_to_personal (EnchantDict *dict, const char *const word, size_t len) win8_dict_add_to_personal (EnchantDict *dict, const char *const word, size_t len)
{ {
auto checker = static_cast<ISpellChecker*>(dict->user_data); auto checker = static_cast<ISpellChecker*>(dict->user_data);
wchar_t *wword = utf8_to_utf16 (word, static_cast<int>(len), false); wchar_t *wword = utf8_to_utf16 (word, size_to_int (len), false);
checker->Add (wword); checker->Add (wword);
std::free (wword); std::free (wword);
@@ -146,7 +153,7 @@ static void
win8_dict_add_to_session (EnchantDict *dict, const char *const word, size_t len) win8_dict_add_to_session (EnchantDict *dict, const char *const word, size_t len)
{ {
auto checker = static_cast<ISpellChecker*>(dict->user_data); auto checker = static_cast<ISpellChecker*>(dict->user_data);
wchar_t *wword = utf8_to_utf16 (word, static_cast<int>(len), false); wchar_t *wword = utf8_to_utf16 (word, size_to_int (len), false);
checker->Ignore (wword); checker->Ignore (wword);
std::free (wword); std::free (wword);
@@ -156,7 +163,7 @@ static int
win8_dict_check (EnchantDict *dict, const char *const word, size_t len) win8_dict_check (EnchantDict *dict, const char *const word, size_t len)
{ {
auto checker = static_cast<ISpellChecker*>(dict->user_data); auto checker = static_cast<ISpellChecker*>(dict->user_data);
wchar_t *wword = utf8_to_utf16 (word, static_cast<int>(len), false); wchar_t *wword = utf8_to_utf16 (word, size_to_int (len), false);
IEnumSpellingError *errors; IEnumSpellingError *errors;
ISpellingError *error = nullptr; ISpellingError *error = nullptr;
HRESULT hr; HRESULT hr;
@@ -184,7 +191,7 @@ static char **
win8_dict_suggest (EnchantDict *dict, const char *const word, size_t len, size_t *out_n_suggs) win8_dict_suggest (EnchantDict *dict, const char *const word, size_t len, size_t *out_n_suggs)
{ {
auto checker = static_cast<ISpellChecker*>(dict->user_data); auto checker = static_cast<ISpellChecker*>(dict->user_data);
wchar_t *wword = utf8_to_utf16 (word, static_cast<int>(len), false); wchar_t *wword = utf8_to_utf16 (word, size_to_int (len), false);
IEnumString *suggestions; IEnumString *suggestions;
HRESULT hr; HRESULT hr;