diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-08-23 17:13:23 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-08-23 18:13:08 +0000 |
| commit | 4ff8b3a353b1d042e9c47c4f82a3a1f74bcea6e8 (patch) | |
| tree | 8b84bb6e96c771c1da7d35ba76a97a6a37881bc2 /sw | |
| parent | 4d1b6057627c1fbee8cceefe77f9fb1c0af836d5 (diff) | |
check for bad locations
Change-Id: I635585f664e700047d92821fb965d42b803a8a15
(cherry picked from commit b164d08f0c12a3434fad1b40900ddc8cb510370c)
Reviewed-on: https://gerrit.libreoffice.org/17938
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/core/data/ww6/pass/crash-7.doc | bin | 0 -> 6500 bytes | |||
| -rw-r--r-- | sw/source/filter/basflt/fltshell.cxx | 26 |
2 files changed, 18 insertions, 8 deletions
diff --git a/sw/qa/core/data/ww6/pass/crash-7.doc b/sw/qa/core/data/ww6/pass/crash-7.doc Binary files differnew file mode 100644 index 000000000000..5a9dab32bfc6 --- /dev/null +++ b/sw/qa/core/data/ww6/pass/crash-7.doc diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index 24271610362a..eb1e45f049d3 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -419,25 +419,33 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos, return pRet; } -static void MakePoint(const SwFltStackEntry& rEntry, SwDoc* pDoc, +static bool MakePoint(const SwFltStackEntry& rEntry, SwDoc* pDoc, SwPaM& rRegion) { // the anchor is the Pam's Point. It's modified when inserting // text, etc.; therefore it is kept on the stack. Only the // attribute's format needs to be set. rRegion.DeleteMark(); - rRegion.GetPoint()->nNode = rEntry.m_aMkPos.m_nNode.GetIndex() + 1; + + sal_uLong nMk = rEntry.m_aMkPos.m_nNode.GetIndex() + 1; + const SwNodes& rMkNodes = rEntry.m_aMkPos.m_nNode.GetNodes(); + if (nMk >= rMkNodes.Count()) + return false; + + rRegion.GetPoint()->nNode = nMk; SwContentNode* pCNd = GetContentNode(pDoc, rRegion.GetPoint()->nNode, true); rRegion.GetPoint()->nContent.Assign(pCNd, rEntry.m_aMkPos.m_nContent); + return true; } // MakeBookRegionOrPoint() behaves like MakeRegionOrPoint, except that // it adheres to certain restrictions on bookmarks in tables (cannot // span more than one cell) -static void MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc, +static bool MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc, SwPaM& rRegion, bool bCheck ) { - if (rEntry.MakeRegion(pDoc, rRegion, bCheck )){ + if (rEntry.MakeRegion(pDoc, rRegion, bCheck )) + { // sal_Bool b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0; if (rRegion.GetPoint()->nNode.GetNode().FindTableBoxStartNode() != rRegion.GetMark()->nNode.GetNode().FindTableBoxStartNode()) @@ -445,9 +453,9 @@ static void MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc, rRegion.Exchange(); // invalid range rRegion.DeleteMark(); // -> both to mark } - }else{ - MakePoint(rEntry, pDoc, rRegion); + return true; } + return MakePoint(rEntry, pDoc, rRegion); } // IterateNumrulePiece() looks for the first range valid for Numrules @@ -596,8 +604,10 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, break; case RES_FLTR_ANNOTATIONMARK: { - MakeBookRegionOrPoint(rEntry, pDoc, aRegion, true); - pDoc->getIDocumentMarkAccess()->makeAnnotationMark(aRegion, OUString()); + if (MakeBookRegionOrPoint(rEntry, pDoc, aRegion, true)) + pDoc->getIDocumentMarkAccess()->makeAnnotationMark(aRegion, OUString()); + else + SAL_WARN("sw", "failed to make book region or point"); } break; case RES_FLTR_TOX: |