diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
| commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
| tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/JavaScriptCore/heap/MarkStack.cpp | |
| parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
| download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz | |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/JavaScriptCore/heap/MarkStack.cpp')
| -rw-r--r-- | Source/JavaScriptCore/heap/MarkStack.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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 <wtf/Atomics.h> #include <wtf/DataLog.h> @@ -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<JSString*>(cell); |