[webkit-changes] cvs commit: WebCore/khtml/ecma xmlhttprequest.cpp

[Adele]

adele       05/08/10 17:28:30

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/ecma Tag: Safari-2-0-branch xmlhttprequest.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-08-10  Vicki Murley  <vicki at apple.com>
  
          Reviewed by John.
  
  	- attempted fix for <rdar://problem/4070895> 8A428: Unrepro Safari crash on
  	friendster.com (XMLHttpRequest::changeState)
  
          Test cases added: None - there are no known reproducible cases of this crash
  
          * khtml/ecma/xmlhttprequest.cpp:
          (KJS::XMLHttpRequest::changeState): add checks for NULL document
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.109 +16 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.108
  retrieving revision 1.4104.2.109
  diff -u -r1.4104.2.108 -r1.4104.2.109
  --- ChangeLog	10 Aug 2005 17:44:22 -0000	1.4104.2.108
  +++ ChangeLog	11 Aug 2005 00:28:22 -0000	1.4104.2.109
  @@ -1,6 +1,22 @@
   2005-08-10  Adele Peterson  <adele at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  +        
  +    2005-08-10  Vicki Murley  <vicki at apple.com>
  +
  +        Reviewed by John.
  + 
  +	- attempted fix for <rdar://problem/4070895> 8A428: Unrepro Safari crash on 
  +	friendster.com (XMLHttpRequest::changeState) 
  +
  +        Test cases added: None - there are no known reproducible cases of this crash
  +
  +        * khtml/ecma/xmlhttprequest.cpp:
  +        (KJS::XMLHttpRequest::changeState): add checks for NULL document
  +
  +2005-08-10  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
   
       2005-08-09  David Harrison  <harrison at apple.com>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.26.8.5  +2 -2      WebCore/khtml/ecma/xmlhttprequest.cpp
  
  Index: xmlhttprequest.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/xmlhttprequest.cpp,v
  retrieving revision 1.26.8.4
  retrieving revision 1.26.8.5
  diff -u -r1.26.8.4 -r1.26.8.5
  --- xmlhttprequest.cpp	1 Jun 2005 22:34:55 -0000	1.26.8.4
  +++ xmlhttprequest.cpp	11 Aug 2005 00:28:30 -0000	1.26.8.5
  @@ -256,13 +256,13 @@
     if (state != newState) {
       state = newState;
       
  -    if (onReadyStateChangeListener != 0 && doc->part()) {
  +    if (doc && doc->part() && onReadyStateChangeListener != 0) {
         DOM::Event ev = doc->part()->document().createEvent("HTMLEvents");
         ev.initEvent("readystatechange", true, true);
         onReadyStateChangeListener->handleEvent(ev, true);
       }
       
  -    if (state == Completed && onLoadListener != 0 && doc->part()) {
  +    if (doc && doc->part() && state == Completed && onLoadListener != 0) {
         DOM::Event ev = doc->part()->document().createEvent("HTMLEvents");
         ev.initEvent("load", true, true);
         onLoadListener->handleEvent(ev, true);