sw/source/core/layout/newfrm.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit a636d2ee19fcb319b028e04395c2eee0f624263c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Oct 9 16:05:11 2017 +0200
Revert "Revert "Fix -fsanitize=signed-integer-overflow""
This reverts commit ce057e662b2e10e111353e9461c3c01434ddbb0f; the original
63d845dc88690b9c5c8194e1512a8e4390c7ee24 appears to be useful after all to
make
UBSan 'instdir/program/soffice sw/qa/extras/uiwriter/data/tdf112860.fodt'
succeed after 'make -O -j12 ExternalPackage_fonts_liberation.clean', see
tdf#112942.
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 51e25db4f792..cb11e045f5ad 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <o3tl/safeint.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
#include <drawdoc.hxx>
@@ -104,7 +107,7 @@ static SwRectFnCollection aHorizontal = {
&FirstMinusSecond,
&FirstMinusSecond,
&SwIncrement,
- &SwIncrement,
+ &o3tl::saturating_add<long>,
&SwRect::SetLeftAndWidth,
&SwRect::SetTopAndHeight
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
