sd/source/ui/remotecontrol/BufferedStreamSocket.cxx | 6 +++--- sd/source/ui/remotecontrol/Receiver.cxx | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit e818eedacaddad52c83d3102df8f1183a675697c Author: Thorsten Behrens <tbehr...@suse.com> Date: Tue Feb 19 12:18:12 2013 +0100 Fix crashes in sdremote after suspend/resume cycles. Change-Id: I0f64820887919386f266290ae8b7c53f8a0a5458 Signed-off-by: Michael Meeks <michael.me...@suse.com> diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx index c4f7f611..71fec17 100644 --- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx +++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx @@ -73,7 +73,7 @@ sal_Int32 BufferedStreamSocket::readLine( OString& aLine ) // Process buffer first incase data already present. vector<char>::iterator aIt; if ( (aIt = find( aBuffer.begin(), aBuffer.end(), '\n' )) - != aBuffer.end() ) + != aBuffer.end() ) { sal_uInt64 aLocation = aIt - aBuffer.begin(); @@ -92,9 +92,9 @@ sal_Int32 BufferedStreamSocket::readLine( OString& aLine ) else aRet = ::recv( mSocket, &aBuffer[aRead], 100, 0 ); - if ( aRet == 0 ) + if ( aRet <= 0 ) { - return aRet; + return 0; } // Prevent buffer from growing massively large. if ( aRead > MAX_LINE_LENGTH ) diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index c3e7d8a..eaa2c6e 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -51,7 +51,8 @@ void Receiver::Timeout() { std::vector< rtl::OString > aCommands( maExecQueue.front() ); maExecQueue.pop_front(); - executeCommand( aCommands ); + if( !aCommands.empty() ) + executeCommand( aCommands ); Start(); } else _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits