Fixed Radar 2928775 - Sherlock crashes sitting in stocks channel

[WebKit-https.git] / JavaScriptCore / kjs / internal.cpp

diff --git a/JavaScriptCore/kjs/internal.cpp b/JavaScriptCore/kjs/internal.cpp
index 217a61784905202ef8c6a5088f3f7c8d92e4c3b7..9ee98b7ff5aa4ef494d6d3cabc71c466fb2d3f99 100644 (file)
--- a/JavaScriptCore/kjs/internal.cpp
+++ b/JavaScriptCore/kjs/internal.cpp
@@ -778,6 +778,7 @@ InterpreterImp::InterpreterImp(Interpreter *interp, const Object &glob)
   // as a root set for garbage collection
 #ifdef APPLE_CHANGES
   Collector::lock();
+  m_interpreter = interp;
 #endif
   if (s_hook) {
     prev = s_hook;
@@ -793,7 +794,9 @@ InterpreterImp::InterpreterImp(Interpreter *interp, const Object &glob)
   Collector::unlock();
 #endif
 
+#ifndef APPLE_CHANGES
   m_interpreter = interp;
+#endif
   global = glob;
   globExec = new ExecState(m_interpreter,0);
   dbg = 0;