[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdelibs/khtml/ecma
From: David Faure <faure () kde ! org>
Date: 2004-11-17 1:19:07
Message-ID: 20041117011907.8CD5316DE6 () office ! kde ! org
[Download RAW message or body]
CVS commit by faure:
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 -3 xmlhttprequest.cpp 1.9
--- kdelibs/khtml/ecma/xmlhttprequest.cpp #1.8:1.9
@@ -359,5 +359,5 @@ void XMLHttpRequest::abort()
{
if (job) {
- job->kill(false);
+ job->kill();
job = 0;
}
@@ -497,5 +497,5 @@ void XMLHttpRequest::processSyncLoadResu
}
-void XMLHttpRequest::slotFinished(KIO::Job *job)
+void XMLHttpRequest::slotFinished(KIO::Job *)
{
if (decoder) {
@@ -503,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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic