Avoid possible null pointer dereference

6bc21bfd · Jesús Corrius · c481fc6b · 6bc21bfd
Kaydet (Commit) 6bc21bfd authored Haz 20, 2011 tarafından Jesús Corrius
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

salframe.cxx vcl/win/source/window/salframe.cxx +5 -1

No files found.
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5239,7 +5239,11 @@ static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam )

    // Feststellen, ob wir IME unterstuetzen
    WinSalFrame* pFrame = GetWindowPtr( hWnd );
-    if ( pFrame && pFrame->mbIME && pFrame->mhDefIMEContext )
+
+    if ( !pFrame )
+        return;
+
+    if ( pFrame->mbIME && pFrame->mhDefIMEContext )
    {
        HKL     hKL = (HKL)lParam;
        UINT    nImeProps = ImmGetProperty( hKL, IGP_PROPERTY );