summaryrefslogtreecommitdiff
path: root/emfio
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-10-28 16:16:51 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-10-29 14:07:44 +0100
commitfc4f2f1b0f8c286e9ae259c44fb249261a8ac47f (patch)
tree02be9a6b0b4832930fa02f384ae6a4ecf80461b1 /emfio
parentdc55f0618cae0e0ec7877eda065cc4b387e16bfb (diff)
ofz#3868 Integer-overflow
Change-Id: Id5de484e365567487cdeaf73f9fa88ef5a735e3e Reviewed-on: https://gerrit.libreoffice.org/44011 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'emfio')
-rw-r--r--emfio/source/reader/emfreader.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index 4ffecf5d8e03..4205d8dee225 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -1921,9 +1921,9 @@ namespace emfio
tools::Rectangle EmfReader::ReadRectangle( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 )
{
- Point aTL ( Point( x1, y1 ) );
- Point aBR( Point( --x2, --y2 ) );
- return tools::Rectangle( aTL, aBR );
+ Point aTL(x1, y1);
+ Point aBR(o3tl::saturating_add<sal_Int32>(x2, -1), o3tl::saturating_add<sal_Int32>(y2, -1));
+ return tools::Rectangle(aTL, aBR);
}
}