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

[Geoffrey]

ggaren      05/08/05 18:16:25

  Modified:    .        ChangeLog
               kjs      object.cpp
  Log:
          -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
  1.774     +14 -0     JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.773
  retrieving revision 1.774
  diff -u -r1.773 -r1.774
  --- ChangeLog	5 Aug 2005 20:44:35 -0000	1.773
  +++ ChangeLog	6 Aug 2005 01:16:24 -0000	1.774
  @@ -1,5 +1,19 @@
   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  Geoffrey Garen  <ggaren at apple.com>
  +
           Fix by darin, reviewed by me.
           
           - rolled in fix for: <rdar://problem/4161606> JavaScript regular 
  
  
  
  1.48      +2 -2      JavaScriptCore/kjs/object.cpp
  
  Index: object.cpp
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/kjs/object.cpp,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- object.cpp	25 Jul 2005 22:17:12 -0000	1.47
  +++ object.cpp	6 Aug 2005 01:16:25 -0000	1.48
  @@ -326,7 +326,7 @@
     if (hasOwnProperty(exec, propertyName))
       return true;
   
  -  if (_proto->dispatchType() != ObjectType) {
  +  if (!_proto || _proto->dispatchType() != ObjectType) {
       return false;
     }
   
  @@ -339,7 +339,7 @@
       if (hasOwnProperty(exec, propertyName))
         return true;
   
  -    if (_proto->dispatchType() != ObjectType) {
  +    if (!_proto || _proto->dispatchType() != ObjectType) {
         return false;
       }