Commit 1040b857 authored by Max Kellermann's avatar Max Kellermann

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

Bugs found by Coverity.
parent e2c81aa9
......@@ -72,7 +72,7 @@ CurlRequest::~CurlRequest() noexcept
}
void
CurlRequest::Start() noexcept
CurlRequest::Start()
{
assert(!registered);
......
......@@ -91,7 +91,7 @@ public:
*
* This method must be called in the event loop thread.
*/
void Start() noexcept;
void Start();
/**
* Unregister this request via CurlGlobal::Remove().
......
......@@ -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)
{
......
......@@ -110,7 +110,11 @@ class UPnPDeviceDirectory final : UpnpCallback {
private:
void OnDeferredStart() noexcept {
request.Start();
try {
request.Start();
} catch (...) {
OnError(std::current_exception());
}
}
/* virtual methods from CurlResponseHandler */
......@@ -147,7 +151,7 @@ class UPnPDeviceDirectory final : UpnpCallback {
public:
UPnPDeviceDirectory(EventLoop &event_loop, UpnpClient_Handle _handle,
UPnPDiscoveryListener *_listener=nullptr) noexcept;
UPnPDiscoveryListener *_listener=nullptr);
~UPnPDeviceDirectory() noexcept;
UPnPDeviceDirectory(const UPnPDeviceDirectory &) = delete;
......
......@@ -140,7 +140,11 @@ private:
void OnDeferredStart() noexcept {
assert(!done);
request.Start();
try {
request.Start();
} catch (...) {
OnError(std::current_exception());
}
}
/* virtual methods from CurlResponseHandler */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment