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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs/KDE/4=2E6=5D_kio/kio=3A_Don=27t_crash_in_he?=
From:       Andre Woebbeking <Woebbeking () kde ! org>
Date:       2011-04-25 8:55:12
Message-ID: 20110425085512.C0454A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 44873e1b04ad8a1d23d1dc442cbb29ee685756b2 by Andre Woebbeking.
Committed on 25/04/2011 at 10:52.
Pushed by woebbe into branch 'KDE/4.6'.

Don't crash in heldSlaveForJob(), slave can be 0.

CCMAIL:adawit@kde.org

M  +3    -1    kio/kio/scheduler.cpp     

http://commits.kde.org/kdelibs/44873e1b04ad8a1d23d1dc442cbb29ee685756b2

diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
index b9b94f9..a7af1b0 100644
--- a/kio/kio/scheduler.cpp
+++ b/kio/kio/scheduler.cpp
@@ -1167,7 +1167,9 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job)
                 slave = m_slaveOnHold;
             } else {
                 kDebug(7006) << "HOLD: Discarding held slave (" << slave << ")";
-                slave->kill();
+                if (slave) {
+                    slave->kill();
+                }
             }
         }
     }

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