50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
diff --git a/src/gui/painting/qfixed_p.h b/src/gui/painting/qfixed_p.h
|
|
index 84659288..57d750a4 100644
|
|
--- a/src/gui/painting/qfixed_p.h
|
|
+++ b/src/gui/painting/qfixed_p.h
|
|
@@ -54,6 +54,7 @@
|
|
#include <QtGui/private/qtguiglobal_p.h>
|
|
#include "QtCore/qdebug.h"
|
|
#include "QtCore/qpoint.h"
|
|
+#include <QtCore/private/qnumeric_p.h>
|
|
#include "QtCore/qsize.h"
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
@@ -182,6 +183,14 @@ Q_DECL_CONSTEXPR inline bool operator<(int i, const QFixed &f) { return i * 64 <
|
|
Q_DECL_CONSTEXPR inline bool operator>(const QFixed &f, int i) { return f.value() > i * 64; }
|
|
Q_DECL_CONSTEXPR inline bool operator>(int i, const QFixed &f) { return i * 64 > f.value(); }
|
|
|
|
+inline bool qAddOverflow(QFixed v1, QFixed v2, QFixed *r)
|
|
+{
|
|
+ int val;
|
|
+ bool result = add_overflow(v1.value(), v2.value(), &val);
|
|
+ r->setValue(val);
|
|
+ return result;
|
|
+}
|
|
+
|
|
#ifndef QT_NO_DEBUG_STREAM
|
|
inline QDebug &operator<<(QDebug &dbg, const QFixed &f)
|
|
{ return dbg << f.toReal(); }
|
|
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
|
|
index 26ac37b0..f6c69ff4 100644
|
|
--- a/src/gui/text/qtextlayout.cpp
|
|
+++ b/src/gui/text/qtextlayout.cpp
|
|
@@ -2150,11 +2150,14 @@ found:
|
|
eng->maxWidth = qMax(eng->maxWidth, line.textWidth);
|
|
} else {
|
|
eng->minWidth = qMax(eng->minWidth, lbh.minw);
|
|
- eng->maxWidth += line.textWidth;
|
|
+ if (qAddOverflow(eng->maxWidth, line.textWidth, &eng->maxWidth))
|
|
+ eng->maxWidth = QFIXED_MAX;
|
|
}
|
|
|
|
- if (line.textWidth > 0 && item < eng->layoutData->items.size())
|
|
- eng->maxWidth += lbh.spaceData.textWidth;
|
|
+ if (line.textWidth > 0 && item < eng->layoutData->items.size()) {
|
|
+ if (qAddOverflow(eng->maxWidth, lbh.spaceData.textWidth, &eng->maxWidth))
|
|
+ eng->maxWidth = QFIXED_MAX;
|
|
+ }
|
|
|
|
line.textWidth += trailingSpace;
|
|
if (lbh.spaceData.length) {
|