From 7b8b16e7bc5692ecea1e0773f56366d38ff176c2 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Tue, 2 Dec 2014 14:04:44 +0100
Subject: [PATCH] Fix crash when setting proto to 0

Change-Id: Id0621c51466721c503f1a54156e21e1671a13561
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/qml/jsruntime/qv4object.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp
index 7e91336..d129175 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;
 }
 
-- 
2.7.4