diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-04-18 13:29:25 -0700 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-04-18 13:29:25 -0700 |
| commit | e9921e77b0a6c66855204db82d56de7925651a4d (patch) | |
| tree | 510e353b4e773e18f95bd7312c813189f947dbb6 /indra/llwindow | |
| parent | efb9df04c3899c269f0c17d2473b4472d5f31ee5 (diff) | |
| parent | d031662435d97101411ae990ed85d6e001ab668a (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index f303d1bb21..a32346bfd3 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -4262,7 +4262,8 @@ BOOL LLWindowWin32::handleImeRequests(WPARAM request, LPARAM param, LRESULT *res S32 context_offset; LLWString context = find_context(wtext, preedit, preedit_length, &context_offset); preedit -= context_offset; - if (preedit_length) + preedit_length = llmin(preedit_length, (S32)context.length() - preedit); + if (preedit_length && preedit >= 0) { // IMR_DOCUMENTFEED may be called when we have an active preedit. // We should pass the context string *excluding* the preedit string. |