diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-07 09:42:19 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-08 09:28:48 +0100 |
| commit | 5c681f0f0f220c80f412d36a1b644c3eb5e080df (patch) | |
| tree | ef50915f96bab132804b06db8be9ef4a339a65b7 /src/qml/jsruntime/qv4proxy.cpp | |
| parent | cbf97ccf8bb46c720de01a79f39b335dc74db71b (diff) | |
V4: Don't crash when iterating invalid Proxy objects
Fixes: QTBUG-81109
Change-Id: I97f37c68d33f414d7bffa9b66e0aaed93370dc68
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4proxy.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4proxy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4proxy.cpp b/src/qml/jsruntime/qv4proxy.cpp index 9325e2e53b..51f96b9003 100644 --- a/src/qml/jsruntime/qv4proxy.cpp +++ b/src/qml/jsruntime/qv4proxy.cpp @@ -515,7 +515,7 @@ ProxyObjectOwnPropertyKeyIterator::ProxyObjectOwnPropertyKeyIterator(ArrayObject PropertyKey ProxyObjectOwnPropertyKeyIterator::next(const Object *m, Property *pd, PropertyAttributes *attrs) { - if (index >= len) + if (index >= len || m == nullptr) return PropertyKey::invalid(); Scope scope(m); |