[Pkg-owncloud-commits] [owncloud-client] 162/219: Attempt to fix a crash

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit a3d70b3cf60481d5c656c3521dc059cb2aceef5a
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Sep 26 10:04:36 2014 +0200

    Attempt to fix a crash
    
    The reply might be null at the point we are timing out.
    Issue #2246
---
 src/mirall/networkjobs.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/mirall/networkjobs.cpp b/src/mirall/networkjobs.cpp
index 995afb9..e92921e 100644
--- a/src/mirall/networkjobs.cpp
+++ b/src/mirall/networkjobs.cpp
@@ -203,11 +203,14 @@ void AbstractNetworkJob::start()
 
 void AbstractNetworkJob::slotTimeout()
 {
-    qDebug() <<  this << "Timeout" ;
-    reply()->abort();
+    qDebug() <<  this << "Timeout";
+    if (reply()) {
+        reply()->abort();
+    } else {
+        qDebug() << "reply was NULL";
+    }
 }
 
-
 /*********************************************************************************************/
 
 RequestEtagJob::RequestEtagJob(Account *account, const QString &path, QObject *parent)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git