Return a Heap::Object in Object::prototype()

Change-Id: Ice0265ae558ba14497421a5bbf25ee9db76adab5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index 8b510fd1fc..5b993ab2f8 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -142,7 +142,7 @@ Heap::WithContext::WithContext(ExecutionEngine *engine, QV4::Object *with)
     lookups = parent->lookups;
     compilationUnit = parent->compilationUnit;
 
-    withObject = with->d();
+    withObject = with ? with->d() : 0;
 }
 
 Heap::CatchContext::CatchContext(ExecutionEngine *engine, QV4::String *exceptionVarName, const ValueRef exceptionValue)
@@ -269,7 +269,8 @@ void ExecutionContext::markObjects(Heap::Base *m, ExecutionEngine *engine)
         c->function->mark(engine);
     } else if (ctx->type == Heap::ExecutionContext::Type_WithContext) {
         WithContext::Data *w = static_cast<WithContext::Data *>(ctx);
-        w->withObject->mark(engine);
+        if (w->withObject)
+            w->withObject->mark(engine);
     } else if (ctx->type == Heap::ExecutionContext::Type_CatchContext) {
         CatchContext::Data *c = static_cast<CatchContext::Data *>(ctx);
         c->exceptionVarName->mark(engine);