richedit: Prevent uninitialized value from being used.

NULL may be returned by ITextHost::TxGetDC. Caught by valgrind.

richedit: Prevent uninitialized value from being used.
530a6c45 · Dylan Smith · Alexandre Julliard · 352ae8b4 · 530a6c45
Commit 530a6c45 authored Jan 25, 2010 by Dylan Smith Committed by Alexandre Julliard Jan 25, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

run.c dlls/riched20/run.c +8 -3

No files found.
--- a/dlls/riched20/run.c
+++ b/dlls/riched20/run.c
@@ -550,9 +550,14 @@ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run)
 static void ME_GetTextExtent(ME_Context *c, LPCWSTR szText, int nChars, ME_Style *s, SIZE *size)
 {
  HGDIOBJ hOldFont;
-  hOldFont = ME_SelectStyleFont(c, s);
-  GetTextExtentPoint32W(c->hDC, szText, nChars, size);
-  ME_UnselectStyleFont(c, s, hOldFont);
+  if (c->hDC) {
+    hOldFont = ME_SelectStyleFont(c, s);
+    GetTextExtentPoint32W(c->hDC, szText, nChars, size);
+    ME_UnselectStyleFont(c, s, hOldFont);
+  } else {
+    size->cx = 0;
+    size->cy = 0;
+  }
 }

 /******************************************************************************