diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-06-08 19:17:47 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-06-08 23:56:23 +0300 |
| commit | 3a16a54452eee72535e15a738c3678dc5671e24e (patch) | |
| tree | ca41c96de5b8c39b850338781bc7fc05dc6dc670 | |
| parent | 0a745b47880fb16b1db8cd3327377a383dbfe6a8 (diff) | |
SL-15359 out_of_range exception
| -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 b2b123f0da..1d6b14e3a0 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -4260,7 +4260,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. |