[Libreoffice-commits] core.git: sd/source

[Arnaud Versini]

 sd/source/ui/remotecontrol/Server.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit d1273b428e60a3bd20fe57400e21dbb605879fb3
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date:   Sun Feb 10 10:28:08 2013 +0100

    sdremote : Remove pointer to deleted RemoteServer on error case
    
    Change-Id: Id0fcbf46c907b94f1233acfbd84036b85ca388a3
    Reviewed-on: https://gerrit.libreoffice.org/2081
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 561dac1..5b53b87 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -81,18 +81,21 @@ void RemoteServer::execute()
     if (!xContext.is() || !officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
     {
         SAL_INFO("sdremote", "not in experimental mode, disabling TCP server");
+        spServer = NULL;
         return;
     }
     osl::SocketAddr aAddr( "0", PORT );
     if ( !mSocket.bind( aAddr ) )
     {
         SAL_WARN( "sdremote", "bind failed" << mSocket.getErrorAsString() );
+        spServer = NULL;
         return;
     }
 
     if ( !mSocket.listen(3) )
     {
         SAL_WARN( "sdremote", "listen failed" << mSocket.getErrorAsString() );
+        spServer = NULL;
         return;
     }
     while ( true )
@@ -102,6 +105,7 @@ void RemoteServer::execute()
         if ( mSocket.acceptConnection( aSocket ) == osl_Socket_Error )
         {
             SAL_WARN( "sdremote", "accept failed" << mSocket.getErrorAsString() );
+            spServer = NULL;
             return; // Closed, or other issue.
         }
         BufferedStreamSocket *pSocket = new BufferedStreamSocket( aSocket);