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

List:       kde-commits
Subject:    KDE/kdelibs/kio/kio
From:       David Faure <faure () kde ! org>
Date:       2009-12-16 16:16:17
Message-ID: 1260980177.572551.16399.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1062999 by dfaure:

Fix crash in ~KCompositeJobPrivate after an error happens in a TransferJob.
Fixed for: 4.4
BUG: 214100
BUG: 202091
BUG: 197289
BUG: 180791
CCBUG: 218719
CCBUG: 162285


 M  +9 -2      job.cpp  


--- trunk/KDE/kdelibs/kio/kio/job.cpp #1062998:1062999
@@ -2022,10 +2022,15 @@
               offset = 0;
             else if ( res == R_CANCEL )
             {
-                if ( job == m_putJob )
+                if ( job == m_putJob ) {
                     m_putJob->kill( FileCopyJob::Quietly );
-                else
+                    q->removeSubjob(m_putJob);
+                    m_putJob = 0;
+                } else {
                     m_copyJob->kill( FileCopyJob::Quietly );
+                    q->removeSubjob(m_copyJob);
+                    m_copyJob = 0;
+                }
                 q->setError( ERR_USER_CANCELED );
                 q->emitResult();
                 return;
@@ -2112,6 +2117,8 @@
        q->setError( ERR_INTERNAL );
        q->setErrorText( "'Put' job did not send canResume or 'Get' job did not send data!" );
        m_putJob->kill( FileCopyJob::Quietly );
+       q->removeSubjob(m_putJob);
+       m_putJob = 0;
        q->emitResult();
        return;
    }
[prev in list] [next in list] [prev in thread] [next in thread]