diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-05-15 09:01:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-05-15 09:01:29 +0200 |
| commit | 0ae26f8c574411cbab748128a317cc08dafe2382 (patch) | |
| tree | 41437d5d0ff7cc714ff37be23b25ca7ce6b792a6 /src/qml/jsruntime/qv4dataview.cpp | |
| parent | d4042c8cd82b35b3ec67c4309d80c9c92f55d889 (diff) | |
| parent | 3ed33ec74b70bbac016dd080889bb3df3a78d90c (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: If1868d27ea40fdc206971c2f7a24e91c5e62b1bf
Diffstat (limited to 'src/qml/jsruntime/qv4dataview.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4dataview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4dataview.cpp b/src/qml/jsruntime/qv4dataview.cpp index bb1acb963e..264057e162 100644 --- a/src/qml/jsruntime/qv4dataview.cpp +++ b/src/qml/jsruntime/qv4dataview.cpp @@ -92,7 +92,7 @@ ReturnedValue DataViewCtor::virtualCallAsConstructor(const FunctionObject *f, co uint byteLength = (argc < 3 || argv[2].isUndefined()) ? (bufferLength - offset) : ::toIndex(scope.engine, argv[2]); if (scope.hasException()) return Encode::undefined(); - if (offset + byteLength > bufferLength) + if (offset > bufferLength || byteLength > bufferLength - offset) return scope.engine->throwRangeError(QStringLiteral("DataView: constructor arguments out of range")); Scoped<DataView> a(scope, scope.engine->memoryManager->allocate<DataView>()); |