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

[Adele]

adele       05/08/05 18:33:53

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               kjs      Tag: Safari-2-0-branch object.cpp
  Log:
           Merged fix from TOT to Safari-2-0-branch
  
      2005-08-05  Geoffrey Garen  <ggaren at apple.com>
  
           -fixed <rdar://problem/4207220> REGRESSION (DENVER): Crash occurs
           after clicking on Hangman applet
  
           Reviewed by darin.
  
           * kjs/object.cpp:
           (KJS::ObjectImp::hasProperty): added check for null prototype.
  
           FIXME: The long-term plan is to make runtime objects use JS Null()
           instead of null pointers, which will allow us to eliminate null
           checks, improving performance.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.677.6.19 +18 -0     JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.677.6.18
  retrieving revision 1.677.6.19
  diff -u -r1.677.6.18 -r1.677.6.19
  --- ChangeLog	6 Aug 2005 01:31:28 -0000	1.677.6.18
  +++ ChangeLog	6 Aug 2005 01:33:52 -0000	1.677.6.19
  @@ -1,5 +1,23 @@
   2005-08-05  Adele Peterson  <adele at apple.com>
   
  +         Merged fix from TOT to Safari-2-0-branch
  +
  +    2005-08-05  Geoffrey Garen  <ggaren at apple.com>
  +
  +         -fixed <rdar://problem/4207220> REGRESSION (DENVER): Crash occurs 
  +         after clicking on Hangman applet
  + 
  +         Reviewed by darin.
  + 
  +         * kjs/object.cpp:
  +         (KJS::ObjectImp::hasProperty): added check for null prototype.
  + 
  +         FIXME: The long-term plan is to make runtime objects use JS Null()
  +         instead of null pointers, which will allow us to eliminate null
  +         checks, improving performance.
  +
  +2005-08-05  Adele Peterson  <adele at apple.com>
  +
           Reviewed by Darin.
   
           * JavaScriptCore.xcodeproj/project.pbxproj: Unchecked 'statics are thread safe' option.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.40.8.2  +2 -2      JavaScriptCore/kjs/object.cpp
  
  Index: object.cpp
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/kjs/object.cpp,v
  retrieving revision 1.40.8.1
  retrieving revision 1.40.8.2
  diff -u -r1.40.8.1 -r1.40.8.2
  --- object.cpp	2 Aug 2005 21:26:20 -0000	1.40.8.1
  +++ object.cpp	6 Aug 2005 01:33:53 -0000	1.40.8.2
  @@ -285,7 +285,7 @@
     if (hasOwnProperty(exec, propertyName))
       return true;
   
  -  if (_proto->dispatchType() != ObjectType) {
  +  if (!_proto || _proto->dispatchType() != ObjectType) {
       return false;
     }
   
  @@ -298,7 +298,7 @@
       if (hasOwnProperty(exec, propertyName))
         return true;
   
  -    if (_proto->dispatchType() != ObjectType) {
  +    if (!_proto || _proto->dispatchType() != ObjectType) {
         return false;
       }