[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdelibs/khtml/ecma
From:       Stephan Kulow <coolo () kde ! org>
Date:       2004-11-17 13:36:12
Message-ID: 20041117133612.AA1DE16DC8 () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

backported cvs diff -r last_3_3_merge xmlhttprequest.cpp. Mostly David's:
>Fix the crash at the right place - job must be set to 0 before
>calling changeState, and "job" must be the member variable, not the argument
>of the method!


  M +5 -5      xmlhttprequest.cpp   1.3.2.4


--- kdelibs/khtml/ecma/xmlhttprequest.cpp  #1.3.2.3:1.3.2.4
@@ -498,5 +497,5 @@ void XMLHttpRequest::processSyncLoadResu
 }
 
-void XMLHttpRequest::slotFinished(KIO::Job *job)
+void XMLHttpRequest::slotFinished(KIO::Job *)
 {
   if (decoder) {
@@ -504,6 +503,8 @@ void XMLHttpRequest::slotFinished(KIO::J
   }
 
-  changeState(Completed);
+  // make sure to forget about the job before emitting completed,
+  // since changeState triggers JS code, which might e.g. call abort.
   job = 0;
+  changeState(Completed);
 
   delete decoder;


[prev in list] [next in list] [prev in thread] [next in thread]