diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-07-06 06:31:25 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-07-06 06:58:06 +0200 |
| commit | cbb081e2d4bb6d6ded1bd3ff97fc53e5a874a12c (patch) | |
| tree | eabe0d27788a8bda6b7b2d7f6e4a3900c19745d1 | |
| parent | 0612430277f4cfb38b9c1eb0d5471e4bdbe1db00 (diff) | |
coverity#982182: Unchecked return value
Change-Id: I5a1820339ea598a606c46a1e03cd296fe81ef22f
| -rw-r--r-- | sd/source/ui/remotecontrol/DiscoveryService.cxx | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx index d37dc3b82ccb..5dbebe781b29 100644 --- a/sd/source/ui/remotecontrol/DiscoveryService.cxx +++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx @@ -152,22 +152,29 @@ void SAL_CALL DiscoveryService::run() memset( aBuffer, 0, sizeof(char) * BUFFER_SIZE ); sockaddr_in aAddr; socklen_t aLen = sizeof( aAddr ); - recvfrom( mSocket, aBuffer, BUFFER_SIZE, 0, (sockaddr*) &aAddr, &aLen ); - OString aString( aBuffer, strlen( "LOREMOTE_SEARCH" ) ); - if ( aString == "LOREMOTE_SEARCH" ) + if(recvfrom( mSocket, aBuffer, BUFFER_SIZE, 0, (sockaddr*) &aAddr, &aLen ) > 0) { - OStringBuffer aStringBuffer("LOREMOTE_ADVERTISE\n"); - aStringBuffer.append( OUStringToOString( - osl::SocketAddr::getLocalHostname(), RTL_TEXTENCODING_UTF8 ) ) - .append( "\n\n" ); - if ( sendto( mSocket, aStringBuffer.getStr(), - aStringBuffer.getLength(), 0, (sockaddr*) &aAddr, - sizeof(aAddr) ) <= 0 ) + OString aString( aBuffer, strlen( "LOREMOTE_SEARCH" ) ); + if ( aString == "LOREMOTE_SEARCH" ) { - // Read error or closed socket -- we are done. - return; + OStringBuffer aStringBuffer("LOREMOTE_ADVERTISE\n"); + aStringBuffer.append( OUStringToOString( + osl::SocketAddr::getLocalHostname(), RTL_TEXTENCODING_UTF8 ) ) + .append( "\n\n" ); + if ( sendto( mSocket, aStringBuffer.getStr(), + aStringBuffer.getLength(), 0, (sockaddr*) &aAddr, + sizeof(aAddr) ) <= 0 ) + { + // Write error or closed socket -- we are done. + return; + } } } + else + { + // Read error or closed socket -- we are done. + return; + } } } |