[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - net/Socket.hpp

[Ashod Nakashian]

 net/Socket.hpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 78e2d97ae3750fa4b2487b4062a975083f82c83b
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Apr 9 20:56:39 2017 -0400

    wsd: assert valid socket where it counts
    
    Change-Id: I19faa175066cab4e0435f6a8bf29e6b051c86420
    Reviewed-on: https://gerrit.libreoffice.org/36330
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit cdb80e56325ba0b4d9abbd438d085f6c91c75855)
    Reviewed-on: https://gerrit.libreoffice.org/36337
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 38a2af85..f2c65d0c 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -273,12 +273,12 @@ public:
     void removeSockets()
     {
         LOG_DBG("Removing all sockets from " << _name << ".");
-        assert(socket);
         assertCorrectThread();
 
         while (!_pollSockets.empty())
         {
             const std::shared_ptr<Socket>& socket = _pollSockets.back();
+            assert(socket);
 
             LOG_DBG("Removing socket #" << socket->getFD() << " from " << _name);
             socket->assertCorrectThread();