diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-01-16 17:00:06 +0000 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-01-17 16:58:31 +0000 |
commit | 7deb0227ad0556e2c40231f26b637272e84f5d7e (patch) | |
tree | 80285aee897b8d39e6105f97adbff917ef5d3de2 /filter | |
parent | 3c4e7d1eaf18de200560f13cc0b84673507deb5c (diff) |
ofz: ensure nOldSize is > 0
Change-Id: Iaf385c9cd4fd37d56879908c00c7483762d66a0b
(cherry picked from commit dd70861fd7123c826feefa86f8af1da1f4877c97)
Reviewed-on: https://gerrit.libreoffice.org/33178
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 253a5c8144ba..f1fc8f332c6f 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -510,7 +510,7 @@ void OS2METReader::AddPointsToArea(const tools::Polygon & rPoly) else { tools::Polygon aLastPoly(pPP->GetObject(pPP->Count()-1)); nOldSize=aLastPoly.GetSize(); - if (aLastPoly.GetPoint(nOldSize-1)==rPoly.GetPoint(0)) nOldSize--; + if (nOldSize && aLastPoly.GetPoint(nOldSize-1)==rPoly.GetPoint(0)) nOldSize--; nNewSize=nOldSize+rPoly.GetSize(); aLastPoly.SetSize(nNewSize); for (i=nOldSize; i<nNewSize; i++) { @@ -531,7 +531,7 @@ void OS2METReader::AddPointsToPath(const tools::Polygon & rPoly) else { tools::Polygon aLastPoly(pPP->GetObject(pPP->Count()-1)); nOldSize=aLastPoly.GetSize(); - if (aLastPoly.GetPoint(nOldSize-1)!=rPoly.GetPoint(0)) pPP->Insert(rPoly); + if (nOldSize && aLastPoly.GetPoint(nOldSize-1)!=rPoly.GetPoint(0)) pPP->Insert(rPoly); else { nOldSize--; nNewSize=nOldSize+rPoly.GetSize(); |