richedit: Null pointer check missing on optional parameter.

The function ME_FindRunInRow uses two parameters to return values by reference, and treated these parameters as if they were optional except for the start of the function which set *pbCaretAtEnd without checking to see if was a NULL pointer.

richedit: Null pointer check missing on optional parameter.
eaf7beca · Dylan Smith · Alexandre Julliard · cc23d3ef · eaf7beca
Commit eaf7beca authored Jun 25, 2008 by Dylan Smith Committed by Alexandre Julliard Jun 26, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

caret.c dlls/riched20/caret.c +3 -6

No files found.
--- a/dlls/riched20/caret.c
+++ b/dlls/riched20/caret.c
@@ -975,13 +975,13 @@ static ME_DisplayItem *ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pR
  pNext = ME_FindItemFwd(pRow, diRunOrStartRow);
  assert(pNext->type == diRun);
  pLastRun = pNext;
-  *pbCaretAtEnd = FALSE;
+  if (pbCaretAtEnd) *pbCaretAtEnd = FALSE;
+  if (pOffset) *pOffset = 0;
  do {
    int run_x = pNext->member.run.pt.x;
    int width = pNext->member.run.nWidth;
    if (x < run_x)
    {
-      if (pOffset) *pOffset = 0;
      return pNext;
    }
    if (x >= run_x && x < run_x+width)
@@ -1001,12 +1001,9 @@ static ME_DisplayItem *ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pR
  if ((pLastRun->member.run.nFlags & MERF_ENDPARA) == 0)
  {
    pNext = ME_FindItemFwd(pNext, diRun);
-    if (pbCaretAtEnd) *pbCaretAtEnd = 1;
+    if (pbCaretAtEnd) *pbCaretAtEnd = TRUE;
-    if (pOffset) *pOffset = 0;
    return pNext;
  } else {
-    if (pbCaretAtEnd) *pbCaretAtEnd = 0;
-    if (pOffset) *pOffset = 0;
    return pLastRun;
  }
 }