diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-07 09:03:38 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-08 09:28:43 +0100 |
| commit | cbf97ccf8bb46c720de01a79f39b335dc74db71b (patch) | |
| tree | c2e127ab8c77e3f9f6f417b8207d73f0016b81ce /src/qml/jsruntime/qv4arraydata.cpp | |
| parent | 9c6a626202a65fea2a30167a62ff8ea56514b59c (diff) | |
V4: Don't crash when sorting arrays with non-stringifyable entries
Fixes: QTBUG-81108
Change-Id: I7e121776a2416b5338c4c1309ec7cc31c703ad28
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4arraydata.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4arraydata.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp index 36a53a7057..1c587d2367 100644 --- a/src/qml/jsruntime/qv4arraydata.cpp +++ b/src/qml/jsruntime/qv4arraydata.cpp @@ -659,6 +659,12 @@ bool ArrayElementLessThan::operator()(Value v1, Value v2) const } ScopedString p1s(scope, v1.toString(scope.engine)); ScopedString p2s(scope, v2.toString(scope.engine)); + + if (!p1s) + return false; + if (!p2s) + return true; + return p1s->toQString() < p2s->toQString(); } |