diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-12-02 14:04:44 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-20 10:08:00 +0100 |
| commit | 7b8b16e7bc5692ecea1e0773f56366d38ff176c2 (patch) | |
| tree | 7f130f3145255f6c53afd70226b67e7453426bb6 /src/qml/jsruntime/qv4object.cpp | |
| parent | 3f7bab3a92ff5c1d623c633d8a925ff1a9ab5bde (diff) | |
Fix crash when setting proto to 0
Change-Id: Id0621c51466721c503f1a54156e21e1671a13561
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4object.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index 7e913361bf..d129175ed8 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -63,13 +63,13 @@ Heap::Object::Object(InternalClass *internalClass, QV4::Object *prototype) bool Object::setPrototype(Object *proto) { - Heap::Object *pp = proto->d(); + Heap::Object *pp = proto ? proto->d() : 0; while (pp) { if (pp == d()) return false; pp = pp->prototype; } - d()->prototype = proto->d(); + d()->prototype = proto ? proto->d() : 0; return true; } |