diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-27 18:30:35 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-30 23:37:44 +0300 |
| commit | ea19e817c07f4a5eeda939b5ec4dca9e9bb9b90e (patch) | |
| tree | 0c4c5d9568f891bc8cbd011916c7f2e89f1ea18a | |
| parent | 0f235ac6d5a0e3f795c770d44cb172307d0e3123 (diff) | |
| download | qtlocation-mapboxgl-ea19e817c07f4a5eeda939b5ec4dca9e9bb9b90e.tar.gz | |
[core] Fix bugprone-exception-escape errors
As reported by clang-tidy-8.
| -rw-r--r-- | platform/default/src/mbgl/storage/http_file_source.cpp | 5 | ||||
| -rw-r--r-- | platform/node/src/node_map.cpp | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/platform/default/src/mbgl/storage/http_file_source.cpp b/platform/default/src/mbgl/storage/http_file_source.cpp index d55d447ae7..8536990a57 100644 --- a/platform/default/src/mbgl/storage/http_file_source.cpp +++ b/platform/default/src/mbgl/storage/http_file_source.cpp @@ -266,7 +266,10 @@ HTTPRequest::HTTPRequest(HTTPFileSource::Impl* context_, Resource resource_, Fil } HTTPRequest::~HTTPRequest() { - handleError(curl_multi_remove_handle(context->multi, handle)); + if (curl_multi_remove_handle(context->multi, handle) != CURLM_OK) { + mbgl::Log::Error(mbgl::Event::HttpRequest, "Error removing curl multi handle"); + } + context->returnHandle(handle); handle = nullptr; diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp index 2be33150ec..5732484e60 100644 --- a/platform/node/src/node_map.cpp +++ b/platform/node/src/node_map.cpp @@ -29,6 +29,7 @@ #include <mbgl/style/style.hpp> #include <mbgl/util/async_request.hpp> #include <mbgl/util/exception.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/util/premultiply.hpp> #include <unistd.h> @@ -1428,7 +1429,11 @@ NodeMap::NodeMap(v8::Local<v8::Object> options) } NodeMap::~NodeMap() { - if (map) release(); + try { + if (map) release(); + } catch (...) { + mbgl::Log::Error(mbgl::Event::General, "Error release the map object when destroying NodeMap"); + } } std::unique_ptr<mbgl::AsyncRequest> NodeFileSource::request(const mbgl::Resource& resource, mbgl::FileSource::Callback callback_) { |