Skip to content

Commit 21ba389

Browse files
authored
Merge pull request #2096 from mmarkeloff/v1.x
Unhandled errors
2 parents d54b8e8 + 14eecc6 commit 21ba389

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

include/spdlog/details/udp_client-windows.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ class udp_client
6464
addr_.sin_family = PF_INET;
6565
addr_.sin_port = htons(port);
6666
addr_.sin_addr.s_addr = INADDR_ANY;
67-
InetPton(PF_INET, TEXT(host.c_str()), &addr_.sin_addr.s_addr);
67+
if (InetPton(PF_INET, TEXT(host.c_str()), &addr_.sin_addr.s_addr) != 1) {
68+
int last_error = ::WSAGetLastError();
69+
::WSACleanup();
70+
throw_winsock_error_("error: Invalid address!", last_error);
71+
}
6872

6973
socket_ = ::socket(PF_INET, SOCK_DGRAM, 0);
7074
if (socket_ == INVALID_SOCKET)

include/spdlog/details/udp_client.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ class udp_client
5858

5959
sockAddr_.sin_family = AF_INET;
6060
sockAddr_.sin_port = htons(port);
61-
::inet_aton(host.c_str(), &sockAddr_.sin_addr);
61+
62+
if (::inet_aton(host.c_str(), &sockAddr_.sin_addr) == 0) {
63+
cleanup_();
64+
throw_spdlog_ex("error: Invalid address!");
65+
}
6266

6367
::memset(sockAddr_.sin_zero, 0x00, sizeof(sockAddr_.sin_zero));
6468
}

0 commit comments

Comments
 (0)