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

[Timothy]

thatcher    05/09/22 12:28:04

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               kjs      Tag: Safari-2-0-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.37 +12 -0     JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.677.6.36
  retrieving revision 1.677.6.37
  diff -u -r1.677.6.36 -r1.677.6.37
  --- ChangeLog	22 Sep 2005 19:14:22 -0000	1.677.6.36
  +++ ChangeLog	22 Sep 2005 19:28:02 -0000	1.677.6.37
  @@ -1,5 +1,17 @@
   2005-09-22  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.
  +
  +2005-09-22  Timothy Hatcher  <timothy at apple.com>
  +
   	    Merges fixes from TOT to Safari-2-0-branch
   
       2005-09-20  Geoffrey Garen  <ggaren at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.53.10.6 +2 -2      JavaScriptCore/kjs/internal.cpp
  
  Index: internal.cpp
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/kjs/internal.cpp,v
  retrieving revision 1.53.10.5
  retrieving revision 1.53.10.6
  diff -u -r1.53.10.5 -r1.53.10.6
  --- internal.cpp	16 Sep 2005 02:34:03 -0000	1.53.10.5
  +++ internal.cpp	22 Sep 2005 19:28:04 -0000	1.53.10.6
  @@ -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();
   }