diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-20 10:28:31 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-21 20:10:59 +0200 |
| commit | f31a2dc6fc713ee06ea7a9ba45c3ceaace7d735d (patch) | |
| tree | 6682724ad9ac2aa07310e89b5144ddcf9e4716ad /src/qml/jsruntime/qv4arraydata.cpp | |
| parent | 239a90b8d5588bc6536cb81bbba7af8cc049d945 (diff) | |
Check in even more places for exceptions
Amends commit 4c5ed04e64ea9ac0038ae30e1189cfe745b29bd9
Task-number: QTBUG-83384
Pick-to: 5.15 5.12
Change-Id: I0918c27dfa73dff83cbf0f58b41ce8620dff8a0a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4arraydata.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4arraydata.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp index 1c587d2367..0eea3345c5 100644 --- a/src/qml/jsruntime/qv4arraydata.cpp +++ b/src/qml/jsruntime/qv4arraydata.cpp @@ -654,6 +654,8 @@ bool ArrayElementLessThan::operator()(Value v1, Value v2) const jsCallData->args[0] = v1; jsCallData->args[1] = v2; result = o->call(jsCallData); + if (scope.hasException()) + return false; return result->toNumber() < 0; } |