[PATCH] riched20: rcUpdate cannot be NULL in ME_PaintContent (coverity)

Marcus Meissner marcus at jet.franken.de
Wed Jan 28 02:35:07 CST 2009


Hi,

Coverity spotted that rcUpdate cannot be NULL in this
function (dereferenced at beginning, and also only 1 caller
that passes in a non-NULL ptr).

-> simplify.

Ciao, Marcus
---
 dlls/riched20/paint.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c
index 3de26e1..86a3eb1 100644
--- a/dlls/riched20/paint.c
+++ b/dlls/riched20/paint.c
@@ -74,15 +74,12 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *
     if (!bOnlyNew || (item->member.para.nFlags & MEPF_REPAINT))
     {
       /* Draw the pargraph if any of the paragraph is in the update region. */
-      BOOL bPaint = (rcUpdate == NULL);
-      if (rcUpdate)
-        bPaint = ys < rcUpdate->bottom && ye > rcUpdate->top;
-      if (bPaint)
+      if (ys < rcUpdate->bottom && ye > rcUpdate->top)
       {
         ME_DrawParagraph(&c, item);
         /* Clear the repaint flag if the whole paragraph is in the
          * update region. */
-        if (!rcUpdate || (rcUpdate->top <= ys && rcUpdate->bottom >= ye))
+        if (rcUpdate->top <= ys && rcUpdate->bottom >= ye)
           item->member.para.nFlags &= ~MEPF_REPAINT;
       }
     }
-- 
1.5.6



More information about the wine-patches mailing list