oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/{curl,upnp}: add more exception handlers

Browse Source 
Bugs found by Coverity.
This commit is contained in:
Max Kellermann
2017-11-14 20:05:44 +01:00
parent e2c81aa9ea
commit 1040b85785
5 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/upnp/Discovery.cxx
View File

@@ -174,15 +174,19 @@ UPnPDeviceDirectory::OnAlive(Upnp_Discovery *disco) noexcept
{
if (isMSDevice(disco->DeviceType) ||
isCDService(disco->ServiceType)) {
auto *downloader = new Downloader(*this, *disco);
try {
downloader->Start();
} catch (...) {
BlockingCall(GetEventLoop(), [downloader](){
downloader->Destroy();
});
auto *downloader = new Downloader(*this, *disco);
try {
downloader->Start();
} catch (...) {
BlockingCall(GetEventLoop(), [downloader](){
downloader->Destroy();
});
throw;
}
} catch (...) {
LogError(std::current_exception());
return UPNP_E_SUCCESS;
}
@@ -251,7 +255,7 @@ UPnPDeviceDirectory::ExpireDevices()
UPnPDeviceDirectory::UPnPDeviceDirectory(EventLoop &event_loop,
UpnpClient_Handle _handle,
UPnPDiscoveryListener *_listener) noexcept
UPnPDiscoveryListener *_listener)
:curl(event_loop), handle(_handle),
listener(_listener)
{