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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/kio/kio
From:       David Faure <faure () kde ! org>
Date:       2006-10-11 14:43:00
Message-ID: 1160577780.004982.30980.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 594522 by dfaure:

Don't crash when creating a job for an invalid URL and then calling Scheduler::scheduleJob(job),
which aborts if Scheduler::doJob wasn't called. So let's call doJob in all cases, even if we know
right away that this is an error case.
BUG: 135456


 M  +9 -9      job.cpp  


--- branches/KDE/3.5/kdelibs/kio/kio/job.cpp #594521:594522
@@ -410,15 +410,6 @@
   : Job(showProgressInfo), m_slave(0), m_packedArgs(packedArgs),
     m_url(url), m_command(command), m_totalSize(0)
 {
-    if (!m_url.isValid())
-    {
-        m_error = ERR_MALFORMED_URL;
-        m_errorText = m_url.url();
-        QTimer::singleShot(0, this, SLOT(slotFinished()) );
-        return;
-    }
-
-
     if (m_url.hasSubURL())
     {
        KURL::List list = KURL::split(m_url);
@@ -430,6 +421,15 @@
     }
 
     Scheduler::doJob(this);
+
+    if (!m_url.isValid())
+    {
+        kdDebug() << "ERR_MALFORMED_URL" << endl;
+        m_error = ERR_MALFORMED_URL;
+        m_errorText = m_url.url();
+        QTimer::singleShot(0, this, SLOT(slotFinished()) );
+        return;
+    }
 }
 
 void SimpleJob::kill( bool quietly )
[prev in list] [next in list] [prev in thread] [next in thread]