Merge remote-tracking branch 'origin/5.15.0' into 5.15

Change-Id: I1b46a9485d86f4d8ea104df31366fb6ad16a4654

3 files changed, 34 insertions, 14 deletions

diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp
index a3729b4ef9..3bca15d562 100644
--- a/src/corelib/serialization/qcborvalue.cpp
+++ b/src/corelib/serialization/qcborvalue.cpp
@@ -788,17 +788,34 @@ static QCborValue::Type convertToExtendedType(QCborContainerPrivate *d)
             // The data is supposed to be US-ASCII. If it isn't (contains UTF-8),
             // QDateTime::fromString will fail anyway.
             dt = QDateTime::fromString(b->asLatin1(), Qt::ISODateWithMs);
-        } else if (tag == qint64(QCborKnownTags::UnixTime_t) && e.type == QCborValue::Integer) {
-            dt = QDateTime::fromSecsSinceEpoch(e.value, Qt::UTC);
-        } else if (tag == qint64(QCborKnownTags::UnixTime_t) && e.type == QCborValue::Double) {
-            dt = QDateTime::fromMSecsSinceEpoch(qint64(e.fpvalue() * 1000), Qt::UTC);
+        } else if (tag == qint64(QCborKnownTags::UnixTime_t)) {
+            qint64 msecs;
+            bool ok = false;
+            if (e.type == QCborValue::Integer) {
+#if QT_POINTER_SIZE == 8
+                // we don't have a fast 64-bit mul_overflow implementation on
+                // 32-bit architectures.
+                ok = !mul_overflow(e.value, qint64(1000), &msecs);
+#else
+                static const qint64 Limit = std::numeric_limits<qint64>::max() / 1000;
+                ok = (e.value > -Limit && e.value < Limit);
+                if (ok)
+                    msecs = e.value * 1000;
+#endif
+            } else if (e.type == QCborValue::Double) {
+                ok = convertDoubleTo(round(e.fpvalue() * 1000), &msecs);
+            }
+            if (ok)
+                dt = QDateTime::fromMSecsSinceEpoch(msecs, Qt::UTC);
         }
         if (dt.isValid()) {
             QByteArray text = dt.toString(Qt::ISODateWithMs).toLatin1();
-            replaceByteData(text, text.size(), Element::StringIsAscii);
-            e.type = QCborValue::String;
-            d->elements[0].value = qint64(QCborKnownTags::DateTimeString);
-            return QCborValue::DateTime;
+            if (!text.isEmpty()) {
+                replaceByteData(text, text.size(), Element::StringIsAscii);
+                e.type = QCborValue::String;
+                d->elements[0].value = qint64(QCborKnownTags::DateTimeString);
+                return QCborValue::DateTime;
+            }
         }
         break;
     }
@@ -810,9 +827,11 @@ static QCborValue::Type convertToExtendedType(QCborContainerPrivate *d)
                 // normalize to a short (decoded) form, so as to save space
                 QUrl url(e.flags & Element::StringIsUtf16 ?
                              b->asQStringRaw() :
-                             b->toUtf8String());
-                QByteArray encoded = url.toString(QUrl::DecodeReserved).toUtf8();
-                replaceByteData(encoded, encoded.size(), {});
+                             b->toUtf8String(), QUrl::StrictMode);
+                if (url.isValid()) {
+                    QByteArray encoded = url.toString(QUrl::DecodeReserved).toUtf8();
+                    replaceByteData(encoded, encoded.size(), {});
+                }
             }
             return QCborValue::Url;
         }
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp
index 60bfac62ab..e74b825774 100644
--- a/src/corelib/text/qlocale.cpp
+++ b/src/corelib/text/qlocale.cpp
@@ -763,8 +763,6 @@ static void updateSystemPrivate()
         const ushort group = res.toString().at(0).unicode();
         if (group != globalLocaleData.m_decimal)
             globalLocaleData.m_group = group;
-        else if (group == globalLocaleData.m_group)
-            qWarning("System-supplied decimal and grouping character are both 0x%hx", group);
     }
 
     res = sys_locale->query(QSystemLocale::ZeroDigit, QVariant());
diff --git a/src/plugins/platforms/cocoa/qmultitouch_mac.mm b/src/plugins/platforms/cocoa/qmultitouch_mac.mm
index 95256657fe..ac2317b217 100644
--- a/src/plugins/platforms/cocoa/qmultitouch_mac.mm
+++ b/src/plugins/platforms/cocoa/qmultitouch_mac.mm
@@ -184,7 +184,10 @@ QCocoaTouch::getCurrentTouchPointList(NSEvent *event, bool acceptSingleTouch)
     if (_touchCount != _currentTouches.size()) {
         // Remove all instances, and basically start from scratch:
         touchPoints.clear();
-        for (QCocoaTouch *qcocoaTouch : _currentTouches) {
+        // Deleting touch points will remove them from current touches,
+        // so we make a copy of the touches before iterating them.
+        const auto currentTouchesSnapshot = _currentTouches;
+        for (QCocoaTouch *qcocoaTouch : currentTouchesSnapshot) {
             if (!_updateInternalStateOnly) {
                 qcocoaTouch->_touchPoint.state = Qt::TouchPointReleased;
                 touchPoints.insert(qcocoaTouch->_touchPoint.id, qcocoaTouch->_touchPoint);