Merge pull request #1744 from evoskuil/master

Clean up exception trapping in address utils.

Author: evoskuil

include/bitcoin/system/impl/radix/base_16.ipp

@@ -95,7 +95,7 @@ constexpr uint8_t encode_octet(
 
 constexpr std::string encode_base16(const data_slice& data) NOEXCEPT
 {
-    std::string out;
+    std::string out{};
     out.resize(data.size() * octet_width);
     auto digit = out.begin();
 
@@ -111,7 +111,7 @@ constexpr std::string encode_base16(const data_slice& data) NOEXCEPT
 // std::string is constexpr
 constexpr std::string encode_hash(const data_slice& hash) NOEXCEPT
 {
-    std::string out;
+    std::string out{};
     out.resize(hash.size() * octet_width);
     auto digit = out.begin();
 
@@ -194,11 +194,11 @@ constexpr bool decode_hash(data_array<Size>& out,
 }
 
 template <size_t Size>
-constexpr data_array<Size> decode_hash(const std::string_view& in) NOEXCEPT
+constexpr data_array<Size> decode_hash(const std::string_view& in) THROWS
 {
     data_array<Size> out{};
     if (!decode_hash(out, in))
-        return {};
+        throw istream_exception{ "decode_hash" };
 
     return out;
 }
@@ -215,7 +215,7 @@ constexpr std::string base16_string(const char(&string)[Size]) NOEXCEPT
 template <size_t Size, if_odd<Size>>
 data_chunk base16_chunk(const char(&string)[Size]) NOEXCEPT
 {
-    data_chunk out;
+    data_chunk out{};
     decode_base16(out, string);
     return out;
 }

include/bitcoin/system/radix/base_16.hpp

@@ -69,9 +69,9 @@ template <size_t Size>
 constexpr bool decode_hash(data_array<Size>& out,
     const std::string_view& in) NOEXCEPT;
 
-/// Returns null_hash on error.
+/// Throws istream_exception on input error.
 template <size_t Size>
-constexpr data_array<Size> decode_hash(const std::string_view& in) NOEXCEPT;
+constexpr data_array<Size> decode_hash(const std::string_view& in) THROWS;
 
 /// Literal decodings of hex string, errors reflected as zero-filled data.
 /// ---------------------------------------------------------------------------

src/config/utilities.cpp

@@ -59,7 +59,7 @@ inline bool make_address(asio::address& ip, const std::string& host) NOEXCEPT
         ip = boost::asio::ip::make_address(trim_copy(host, { "[", "]" }));
         return true;
     }
-    catch (const std::exception&)
+    catch (...)
     {
         return false;
     }
@@ -160,7 +160,10 @@ inline asio::address to_v4(const boost::asio::ip::address_v6& ip6) THROWS
 {
     // Required for equivalence with boost 1.86.
     if (!ip6.is_v4_mapped())
-        throw std::exception{};
+    {
+        using namespace boost::asio::detail;
+        throw_exception(boost::asio::ip::bad_address_cast{});
+    }
 
     const auto bytes = ip6.to_bytes();
     return
@@ -187,7 +190,7 @@ asio::address denormalize(const asio::address& ip) NOEXCEPT
         {
             return { to_v4(ip.to_v6()) };
         }
-        catch (const std::exception&)
+        catch (...)
         {
             return ip;
         }
@@ -207,7 +210,7 @@ inline std::string to_host(const boost::asio::ip::address_v6& ip6) NOEXCEPT
         return ip6.is_v4_mapped() ? to_host(to_v4(ip6)) : ip6.to_string();
         BC_POP_WARNING()
     }
-    catch (const std::exception&)
+    catch (...)
     {
         return { "::" };
     }
@@ -219,7 +222,7 @@ inline std::string to_host(const boost::asio::ip::address_v4& ip4) NOEXCEPT
     {
         return ip4.to_string();
     }
-    catch (const std::exception&)
+    catch (...)
     {
         return { "0.0.0.0" };
     }
@@ -235,7 +238,7 @@ std::string to_host(const asio::address& ip) NOEXCEPT
         return host.is_v4() ? to_host(host.to_v4()) : to_host(host.to_v6());
         BC_POP_WARNING()
     }
-    catch (const std::exception&)
+    catch (...)
     {
         return { "0.0.0.0" };
     }
@@ -287,7 +290,7 @@ bool is_member(const asio::address& ip, const asio::address& subnet,
         if (ip.is_v6() && subnet.is_v6())
             return is_member_v6(ip.to_v6(), subnet.to_v6(), cidr);
     }
-    catch (const std::exception&)
+    catch (...)
     {
     }