From ea19e817c07f4a5eeda939b5ec4dca9e9bb9b90e Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <tmpsantos@gmail.com>
Date: Fri, 27 Mar 2020 18:30:35 +0200
Subject: [PATCH] [core] Fix bugprone-exception-escape errors

As reported by clang-tidy-8.
---
 platform/default/src/mbgl/storage/http_file_source.cpp | 5 ++++-
 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 d55d447ae..8536990a5 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 2be33150e..5732484e6 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_) {