diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-01-18 21:28:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-01-19 21:51:31 +0100 |
| commit | f69e2f739ca3c23c9de055c8600c867e864cd4ff (patch) | |
| tree | 53f38a54b25dc88933b07f58b5e45ff9b5b3f6f2 /tools | |
| parent | 25d159dd764d917a04e46819bb8efcc2a6067cd6 (diff) | |
ofz#5475 Integer-overflow
Change-Id: I11d706c544698d57b75231e33e3d49f1ac1d4d73
Reviewed-on: https://gerrit.libreoffice.org/48159
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/generic/gen.cxx | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx index 2627d9202842..5fe6eeeaa3d6 100644 --- a/tools/source/generic/gen.cxx +++ b/tools/source/generic/gen.cxx @@ -20,7 +20,7 @@ #include <sal/config.h> #include <sstream> - +#include <o3tl/safeint.hxx> #include <tools/gen.hxx> #include <tools/stream.hxx> @@ -68,6 +68,23 @@ void tools::Rectangle::SetSize( const Size& rSize ) nBottom = RECT_EMPTY; } +void tools::Rectangle::SaturatingSetSize(const Size& rSize) +{ + if (rSize.Width() < 0) + nRight = o3tl::saturating_add(nLeft, (rSize.Width() + 1)); + else if ( rSize.Width() > 0 ) + nRight = o3tl::saturating_add(nLeft, (rSize.Width() - 1)); + else + nRight = RECT_EMPTY; + + if ( rSize.Height() < 0 ) + nBottom = o3tl::saturating_add(nTop, (rSize.Height() + 1)); + else if ( rSize.Height() > 0 ) + nBottom = o3tl::saturating_add(nTop, (rSize.Height() - 1)); + else + nBottom = RECT_EMPTY; +} + tools::Rectangle& tools::Rectangle::Union( const tools::Rectangle& rRect ) { if ( rRect.IsEmpty() ) |