[PATCH] sdremote : Remove pointer to deleted RemoteServer on error c...

[Arnaud Versini (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2081

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/2081/1

sdremote : Remove pointer to deleted RemoteServer on error case

Change-Id: Id0fcbf46c907b94f1233acfbd84036b85ca388a3
---
M sd/source/ui/remotecontrol/Server.cxx
1 file changed, 4 insertions(+), 0 deletions(-)



diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 76b4dd7..a4dd53a 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -80,18 +80,21 @@
     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 )
@@ -101,6 +104,7 @@
         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);

-- 
To view, visit https://gerrit.libreoffice.org/2081
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0fcbf46c907b94f1233acfbd84036b85ca388a3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini <arnaud.versini at gmail.com>