summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-11-03 08:59:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-11-03 20:44:52 +0000
commit4088fff7c09ec0d66b4958190999fa1d371d5bbf (patch)
tree4cc672ce09fdf1549330f2f9f72da130a913a3e1 /sw
parent7f3326f2aa37f16dbf12844895d269dec5ad8c45 (diff)
coverity#705921 Dereference before null check
Change-Id: I7aea5663ed4a5d2f4990292d64eefd782119aded
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/layout/findfrm.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index d11c826536c2..5c727801a237 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1435,10 +1435,8 @@ SwCellFrm* SwCellFrm::GetFollowCell() const
// find most upper row frame
const SwFrm* pRow = GetUpper();
- if (!pRow)
- return NULL;
- while (!pRow->IsRowFrm() || !pRow->GetUpper()->IsTabFrm())
+ while (pRow && (!pRow->IsRowFrm() || !pRow->GetUpper()->IsTabFrm()))
pRow = pRow->GetUpper();
if (!pRow)