From ae2b6f681ac630fa1fb0314294495b71cb1ac231 Mon Sep 17 00:00:00 2001 From: Zufu Liu Date: Sat, 16 Nov 2019 08:05:28 +1100 Subject: Backport: Protect against use of null input context. Backport of changeset 7764:322518a38ece. --- win32/ScintillaWin.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index ef2782fe7..d9b906c1f 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1434,7 +1434,9 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam case WM_LBUTTONDOWN: { // For IME, set the composition string as the result string. IMContext imc(MainHWND()); - ::ImmNotifyIME(imc.hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + if (imc.hIMC) { + ::ImmNotifyIME(imc.hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + } // //Platform::DebugPrintf("Buttdown %d %x %x %x %x %x\n",iMessage, wParam, lParam, // KeyboardIsKeyDown(VK_SHIFT), -- cgit v1.2.3