[Pkg-owncloud-commits] [owncloud-client] 121/159: Prevent another crash in ~SocketApi #3118

[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 155c96586648588ef73edc91c4198d6e3738a2f9
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Fri Apr 17 12:30:54 2015 +0200

    Prevent another crash in ~SocketApi #3118
    
    Since the QLocalServer parent of the QLocalSockets gets destroyed
    after the _listeners QList, onLostConnection might try to update
    an already destroyed list.
    
    Fix the issue by simply making sure that _localServer is destroyed
    first.
---
 src/gui/socketapi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/socketapi.h b/src/gui/socketapi.h
index 3be14f7..97f7b9a 100644
--- a/src/gui/socketapi.h
+++ b/src/gui/socketapi.h
@@ -82,8 +82,8 @@ private:
     Q_INVOKABLE void command_SHARE_MENU_TITLE(const QString& argument, QLocalSocket* socket);
     QString buildRegisterPathMessage(const QString& path);
 
-    QLocalServer _localServer;
     QList<QLocalSocket*> _listeners;
+    QLocalServer _localServer;
     c_strlist_t *_excludes;
     QHash<Folder*, SqlQuery*> _dbQueries;
     QHash<Folder*, SqlDatabase*> _openDbs;

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