[webkit-changes] cvs commit: JavaScriptCore/bindings/objc WebScriptObject.mm

[Darin]

darin       05/08/26 10:58:27

  Modified:    .        ChangeLog
               bindings/objc WebScriptObject.mm
  Log:
          Reviewed by John.
          Landed by Darin.
  
          - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4664
            TOT Crash from backwards null check in WebScriptObject.mm
  
          * bindings/objc/WebScriptObject.mm:
          (+[WebScriptObject _convertValueToObjcValue:originExecutionContext:executionContext:]):
          Remove bogus !.
  
  Revision  Changes    Path
  1.807     +12 -0     JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.806
  retrieving revision 1.807
  diff -u -r1.806 -r1.807
  --- ChangeLog	25 Aug 2005 17:46:52 -0000	1.806
  +++ ChangeLog	26 Aug 2005 17:58:26 -0000	1.807
  @@ -1,3 +1,15 @@
  +2005-08-26  Geoff Garen  <ggaren at apple.com>
  +
  +        Reviewed by John.
  +        Landed by Darin.
  +
  +        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4664
  +          TOT Crash from backwards null check in WebScriptObject.mm
  +
  +        * bindings/objc/WebScriptObject.mm:
  +        (+[WebScriptObject _convertValueToObjcValue:originExecutionContext:executionContext:]):
  +        Remove bogus !.
  +
   2005-08-25  Darin Adler  <darin at apple.com>
   
           Reviewed by John Sullivan.
  
  
  
  1.23      +1 -1      JavaScriptCore/bindings/objc/WebScriptObject.mm
  
  Index: WebScriptObject.mm
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/bindings/objc/WebScriptObject.mm,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- WebScriptObject.mm	16 Aug 2005 00:47:23 -0000	1.22
  +++ WebScriptObject.mm	26 Aug 2005 17:58:27 -0000	1.23
  @@ -419,7 +419,7 @@
   	
           if (objectImp->classInfo() != &RuntimeObjectImp::info) {
   	    ValueImp *runtimeObject = objectImp->get(exec, "__apple_runtime_object");
  -	    if (!runtimeObject && runtimeObject->isObject())
  +	    if (runtimeObject && runtimeObject->isObject())
   		objectImp = static_cast<RuntimeObjectImp*>(runtimeObject);
   	}