encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix candidate list size for Windows IME 

Adjust candidate count so list is not draw bigger that needed. This also fix potential uninitialised read of variable `candsize[i]` if `vertical` is false.
This commit is contained in:
Mathieu Eyraud 2022-08-28 13:02:57 +02:00 committed by Sam Lantinga
parent 644a4e5b31
commit b8af865f18
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/windows/SDL_windowskeyboard.c
View File

@ -1559,7 +1559,7 @@ IME_RenderCandidateList(SDL_VideoData *videodata, HDC hdc)
SIZE candsizes[MAX_CANDLIST]; SIZE candsizes[MAX_CANDLIST];
SIZE maxcandsize = {0}; SIZE maxcandsize = {0};
HBITMAP hbm = NULL; HBITMAP hbm = NULL;
const int candcount = SDL_min(SDL_min(MAX_CANDLIST, videodata->ime_candcount), videodata->ime_candpgsize); int candcount = SDL_min(SDL_min(MAX_CANDLIST, videodata->ime_candcount), videodata->ime_candpgsize);
SDL_bool vertical = videodata->ime_candvertical; SDL_bool vertical = videodata->ime_candvertical;
const int listborder = 1; const int listborder = 1;
@ -1591,8 +1591,10 @@ IME_RenderCandidateList(SDL_VideoData *videodata, HDC hdc)
for (i = 0; i < candcount; ++i) { for (i = 0; i < candcount; ++i) {
const WCHAR *s = &videodata->ime_candidates[i * MAX_CANDLENGTH]; const WCHAR *s = &videodata->ime_candidates[i * MAX_CANDLENGTH];
if (!*s) if (!*s) {
candcount = i;
break; break;
}
GetTextExtentPoint32W(hdc, s, (int)SDL_wcslen(s), &candsizes[i]); GetTextExtentPoint32W(hdc, s, (int)SDL_wcslen(s), &candsizes[i]);
maxcandsize.cx = SDL_max(maxcandsize.cx, candsizes[i].cx); maxcandsize.cx = SDL_max(maxcandsize.cx, candsizes[i].cx);
@ -1654,8 +1656,6 @@ IME_RenderCandidateList(SDL_VideoData *videodata, HDC hdc)
for (i = 0; i < candcount; ++i) { for (i = 0; i < candcount; ++i) {
const WCHAR *s = &videodata->ime_candidates[i * MAX_CANDLENGTH]; const WCHAR *s = &videodata->ime_candidates[i * MAX_CANDLENGTH];
int left, top, right, bottom; int left, top, right, bottom;
if (!*s)
break;
if (vertical) { if (vertical) {
left = listborder + listpadding + candmargin; left = listborder + listpadding + candmargin;