From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 10 Sep 2012 19:10:20 +0200 Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot --- Source/JavaScriptCore/heap/MarkStack.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Source/JavaScriptCore/heap/MarkStack.cpp') diff --git a/Source/JavaScriptCore/heap/MarkStack.cpp b/Source/JavaScriptCore/heap/MarkStack.cpp index 9d3062154..9a4a01f04 100644 --- a/Source/JavaScriptCore/heap/MarkStack.cpp +++ b/Source/JavaScriptCore/heap/MarkStack.cpp @@ -35,10 +35,9 @@ #include "JSArray.h" #include "JSCell.h" #include "JSObject.h" -#include "ScopeChain.h" + #include "SlotVisitorInlineMethods.h" #include "Structure.h" -#include "UString.h" #include "WriteBarrier.h" #include #include @@ -523,6 +522,8 @@ ALWAYS_INLINE void MarkStack::internalAppend(JSValue* slot) return; JSCell* cell = value.asCell(); + if (!cell) + return; if (m_shouldHashConst && cell->isString()) { JSString* string = jsCast(cell); -- cgit v1.2.1