riched20: Fix the struct size check in the para fmt retrieval function.

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

riched20: Fix the struct size check in the para fmt retrieval function.
9908c5d3 · Huw Davies · Alexandre Julliard · 1abbb78a · 9908c5d3
Commit 9908c5d3 authored Oct 27, 2020 by Huw Davies Committed by Alexandre Julliard Oct 27, 2020
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

para.c dlls/riched20/para.c +5 -3

No files found.
--- a/dlls/riched20/para.c
+++ b/dlls/riched20/para.c
@@ -928,7 +928,8 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt)
  ME_DisplayItem *para, *para_end;
  PARAFORMAT2 *curFmt;

-  if (pFmt->cbSize < sizeof(PARAFORMAT)) {
+  if (pFmt->cbSize < sizeof(PARAFORMAT))
+  {
    pFmt->dwMask = 0;
    return;
  }
@@ -951,13 +952,14 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt)
    CHECK_FIELD(PFM_RIGHTINDENT, dxRightIndent);
    CHECK_FIELD(PFM_OFFSET, dxOffset);
    CHECK_FIELD(PFM_ALIGNMENT, wAlignment);
-    if (pFmt->dwMask & PFM_TABSTOPS) {
+    if (pFmt->dwMask & PFM_TABSTOPS)
+    {
      if (pFmt->cTabCount != para->member.para.fmt.cTabCount ||
          memcmp(pFmt->rgxTabs, curFmt->rgxTabs, curFmt->cTabCount*sizeof(int)))
        pFmt->dwMask &= ~PFM_TABSTOPS;
    }

-    if (pFmt->dwMask >= sizeof(PARAFORMAT2))
+    if (pFmt->cbSize >= sizeof(PARAFORMAT2))
    {
      pFmt->dwMask &= ~((pFmt->wEffects ^ curFmt->wEffects) << 16);
      CHECK_FIELD(PFM_SPACEBEFORE, dySpaceBefore);