From 20f4a9ff7b1cf4f4e2ddfc11f4fce44293268e57 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Mon, 5 Oct 2015 00:40:16 +0300 Subject: [PATCH] riched20: Handle invalid HFONT values passed to WM_SETFONT. Signed-off-by: Nikolay Sivov --- dlls/riched20/editor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a55a1090c15..ae4a3abb593 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3767,7 +3767,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (!wParam) wParam = (WPARAM)GetStockObject(SYSTEM_FONT); - GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf); + + if (!GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf)) + return 0; + hDC = ITextHost_TxGetDC(editor->texthost); ME_CharFormatFromLogFont(hDC, &lf, &fmt); ITextHost_TxReleaseDC(editor->texthost, hDC);