diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-11-12 11:01:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-15 13:07:11 +0100 |
| commit | d8fe3dfde9c6f73c49c8e69b41d77710f8dc463a (patch) | |
| tree | 3fe77c80da6c254eebb5ba0718239ae10eaf4ba7 /src/qml/jsruntime | |
| parent | a82f89da2ad59c6ae5f83cbf35ecfaa6a56de2a4 (diff) | |
Don't crash when trying to assign to null.prop
Fixes a regression introduced during the exception handling
refactoring.
Task-number: QTBUG-34544
Change-Id: Ib751274d759030db3e5d3b1380b30dc07ec85f83
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index 7f70837eff..376d61bd67 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -533,6 +533,8 @@ void __qmljs_set_property(ExecutionContext *ctx, const ValueRef object, const St { Scope scope(ctx); ScopedObject o(scope, object->toObject(ctx)); + if (!o) + return; o->put(name, value); } |