1 files changed, 43 insertions, 41 deletions
diff --git a/src/qml/common/qjsnumbercoercion.h b/src/qml/common/qjsnumbercoercion.h
index 51dbe6beb5..0023bff6e8 100644
--- a/src/qml/common/qjsnumbercoercion.h
+++ b/src/qml/common/qjsnumbercoercion.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QJSNUMBERCOERCION_H
 #define QJSNUMBERCOERCION_H
@@ -48,10 +12,48 @@ QT_BEGIN_NAMESPACE
 class QJSNumberCoercion
 {
 public:
+
+    static constexpr bool isInteger(double d)
+    {
+        // Comparing d with itself checks for NaN and comparing d with the min and max values
+        // for int also covers infinities.
+        if (!equals(d, d) || d < (std::numeric_limits<int>::min)()
+            || d > (std::numeric_limits<int>::max)()) {
+            return false;
+        }
+
+        return equals(static_cast<int>(d), d);
+    }
+
+    static constexpr bool isArrayIndex(double d)
+    {
+        return d >= 0
+                && equals(d, d)
+                && d <= (std::numeric_limits<uint>::max)()
+                && equals(static_cast<uint>(d), d);
+    }
+
+    static constexpr bool isArrayIndex(qint64 i)
+    {
+        return i >= 0 && i <= (std::numeric_limits<uint>::max)();
+    }
+
+    static constexpr bool isArrayIndex(quint64 i)
+    {
+        return i <= (std::numeric_limits<uint>::max)();
+    }
+
     static constexpr int toInteger(double d) {
-        int i = static_cast<int>(d);
-        if (equals(i, d))
-            return i;
+        // Check for NaN
+        if (!equals(d, d))
+            return 0;
+
+        if (d >= (std::numeric_limits<int>::min)() && d <= (std::numeric_limits<int>::max)()) {
+            const int i = static_cast<int>(d);
+            if (equals(i, d))
+                return i;
+        }
+
         return QJSNumberCoercion(d).toInteger();
     }