[webkit-changes] cvs commit: JavaScriptCore/kjs internal.cpp

[Timothy]

thatcher    05/09/21 14:58:42

  Modified:    .        Tag: Safari-Den-branch ChangeLog
               kjs      Tag: Safari-Den-branch internal.cpp
  Log:
            - Fixed <rdar://problem/4263434> <rdar://problem/4263434> Denver 8F29 Regression:
              KJS::InterpreterImp::mark() crash
  
            Fix by mjs, review by Geoff.
  
            * kjs/internal.cpp:
            (KJS::InterpreterImp::mark): Added a null check on globExec in case a
            garbage collection occurs inside InterpreterImp::globalInit (called
            from InterpreterImp::InterpreterImp), at which point globExec has not yet been initialized.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.677.6.34.2.3 +12 -0     JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.677.6.34.2.2
  retrieving revision 1.677.6.34.2.3
  diff -u -r1.677.6.34.2.2 -r1.677.6.34.2.3
  --- ChangeLog	16 Sep 2005 22:14:38 -0000	1.677.6.34.2.2
  +++ ChangeLog	21 Sep 2005 21:58:41 -0000	1.677.6.34.2.3
  @@ -1,3 +1,15 @@
  +2005-09-21  Timothy Hatcher  <timothy at apple.com>
  +
  +          - Fixed <rdar://problem/4263434> <rdar://problem/4263434> Denver 8F29 Regression:
  +            KJS::InterpreterImp::mark() crash
  +
  +          Fix by mjs, review by Geoff.
  +
  +          * kjs/internal.cpp:
  +          (KJS::InterpreterImp::mark): Added a null check on globExec in case a
  +          garbage collection occurs inside InterpreterImp::globalInit (called
  +          from InterpreterImp::InterpreterImp), at which point globExec has not yet been initialized.
  +
   === Safari-416.8 ===
   
   2005-09-14  Maciej Stachowiak  <mjs at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.53.10.4.2.2 +2 -2      JavaScriptCore/kjs/internal.cpp
  
  Index: internal.cpp
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/kjs/internal.cpp,v
  retrieving revision 1.53.10.4.2.1
  retrieving revision 1.53.10.4.2.2
  diff -u -r1.53.10.4.2.1 -r1.53.10.4.2.2
  --- internal.cpp	16 Sep 2005 02:54:25 -0000	1.53.10.4.2.1
  +++ internal.cpp	21 Sep 2005 21:58:42 -0000	1.53.10.4.2.2
  @@ -542,7 +542,7 @@
   }
   
   InterpreterImp::InterpreterImp(Interpreter *interp, const Object &glob)
  -    : _context(0)
  +    : globExec(0), _context(0)
   {
     // add this interpreter to the global chain
     // as a root set for garbage collection
  @@ -761,7 +761,7 @@
       m_interpreter->mark();
     if (_context)
       _context->mark();
  -  if (!globExec->_exception.isNull())
  +  if (globExec && !globExec->_exception.isNull())
         globExec->_exception.imp()->mark();
   }