coverity#1302687 Dereference null return value

Change-Id: I65e09944bdfa0ccc0aa2b0e6bf423ab943c642f8

coverity#1302687 Dereference null return value
Change-Id: I65e09944bdfa0ccc0aa2b0e6bf423ab943c642f8
29177c9e · Caolán McNamara · c7309a48 · 29177c9e
Kaydet (Commit) 29177c9e authored Haz 01, 2015 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

flycnt.cxx sw/source/core/layout/flycnt.cxx +10 -2

No files found.
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -1241,8 +1241,16 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
        while ( pCnt->IsFollow() )
        {
            do
-            {   pCnt = pCnt->GetPrevContentFrm();
+            {
-            } while ( pCnt->GetFollow() != pFollow );
+                SwContentFrm* pPrev = pCnt->GetPrevContentFrm();
+                if (!pPrev)
+                {
+                    SAL_WARN("sw.core", "very unexpected missing PrevContentFrm");
+                    break;
+                }
+                pCnt = pPrev;
+            }
+            while ( pCnt->GetFollow() != pFollow );
            pFollow = pCnt;
        }
        SwTwips nDiff = 0;