[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit b0f8bffd55e47e246dd2a87b6f7c62e6a55bf537
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 22 07:09:04 2002 +0000

    	Fixed Radar 2928775 - Sherlock crashes sitting in stocks channel
    
    	* kjs/internal.cpp:
    	(InterpreterImp::InterpreterImp): Set the interp pointer earlier,
    	in case garbage collection takes place while creating the global
    	values.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1192 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 80c06dd..75f4de2 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-21  Maciej Stachowiak  <mjs at apple.com>
+
+	Fixed Radar 2928775 - Sherlock crashes sitting in stocks channel
+
+	* kjs/internal.cpp:
+	(InterpreterImp::InterpreterImp): Set the interp pointer earlier,
+	in case garbage collection takes place while creating the global
+	values.
+
 2002-05-15  Darin Adler  <darin at apple.com>
 
 	* Makefile.am:
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 80c06dd..75f4de2 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-05-21  Maciej Stachowiak  <mjs at apple.com>
+
+	Fixed Radar 2928775 - Sherlock crashes sitting in stocks channel
+
+	* kjs/internal.cpp:
+	(InterpreterImp::InterpreterImp): Set the interp pointer earlier,
+	in case garbage collection takes place while creating the global
+	values.
+
 2002-05-15  Darin Adler  <darin at apple.com>
 
 	* Makefile.am:
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 80c06dd..75f4de2 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-05-21  Maciej Stachowiak  <mjs at apple.com>
+
+	Fixed Radar 2928775 - Sherlock crashes sitting in stocks channel
+
+	* kjs/internal.cpp:
+	(InterpreterImp::InterpreterImp): Set the interp pointer earlier,
+	in case garbage collection takes place while creating the global
+	values.
+
 2002-05-15  Darin Adler  <darin at apple.com>
 
 	* Makefile.am:
diff --git a/JavaScriptCore/kjs/internal.cpp b/JavaScriptCore/kjs/internal.cpp
index 217a617..9ee98b7 100644
--- 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;

-- 
WebKit Debian packaging