[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-4' - sd/source

[Caolán McNamara]

 sd/source/ui/remotecontrol/Communicator.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f812ad553ab1702424357495c36cee2f2619e2c1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 16 20:41:44 2014 +0100

    coverity#1202882 Dereference before null check
    
    Change-Id: Ie61df08c11b687c0b4a3ae212b3f9a6c95171396
    (cherry picked from commit c152349f69acfb6bb873ed1cd12ca1b6dc325f1f)
    Reviewed-on: https://gerrit.libreoffice.org/9095
    Tested-by: Andrzej Hunt <andrzej.hunt at collabora.com>
    Reviewed-by: Andrzej Hunt <andrzej.hunt at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/9133
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx
index d3af697..bf399ca 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -122,10 +122,9 @@ void Communicator::execute()
     pTransmitter->join();
     pTransmitter = NULL;
 
-    if( mpSocket )
-        mpSocket->close();
+    mpSocket->close();
     delete mpSocket;
-
+    mpSocket = NULL;
 
     RemoteServer::removeCommunicator( this );
 }