mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crashes in sdremote after suspend/resume cycles.

Browse Source 
Change-Id: I0f64820887919386f266290ae8b7c53f8a0a5458
This commit is contained in:
Thorsten Behrens
2013-02-19 12:18:12 +01:00
parent 4c7d04c681
commit 25f7288ff8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
View File

@@ -77,7 +77,7 @@ sal_Int32 BufferedStreamSocket::readLine( OString& aLine )
// Process buffer first incase data already present. // Process buffer first incase data already present.
vector<char>::iterator aIt; vector<char>::iterator aIt;
if ( (aIt = find( aBuffer.begin(), aBuffer.end(), '\n' )) if ( (aIt = find( aBuffer.begin(), aBuffer.end(), '\n' ))
!= aBuffer.end() ) != aBuffer.end() )
{ {
sal_uInt64 aLocation = aIt - aBuffer.begin(); sal_uInt64 aLocation = aIt - aBuffer.begin();
@@ -96,9 +96,9 @@ sal_Int32 BufferedStreamSocket::readLine( OString& aLine )
else else
aRet = ::recv( mSocket, &aBuffer[aRead], 100, 0 ); aRet = ::recv( mSocket, &aBuffer[aRead], 100, 0 );
if ( aRet == 0 ) if ( aRet <= 0 )
{ {
return aRet; return 0;
} }
// Prevent buffer from growing massively large. // Prevent buffer from growing massively large.
if ( aRead > MAX_LINE_LENGTH ) if ( aRead > MAX_LINE_LENGTH )

3
sd/source/ui/remotecontrol/Receiver.cxx
View File

@@ -52,7 +52,8 @@ void Receiver::Timeout()
{ {
std::vector< rtl::OString > aCommands( maExecQueue.front() ); std::vector< rtl::OString > aCommands( maExecQueue.front() );
maExecQueue.pop_front(); maExecQueue.pop_front();
executeCommand( aCommands ); if( !aCommands.empty() )
executeCommand( aCommands );
Start(); Start();
} }
else else