mirror of
https://github.com/g4klx/DMRGateway.git
synced 2025-12-06 05:32:01 +01:00
Merge pull request #137 from f1rmb/f1rmb_nullptr_vs_NULL_with_getaddrinfo
Fix nullptr instead of NULL argument usage in getaddrinfo().
This commit is contained in:
commit
3d099ae24d
|
|
@ -94,7 +94,7 @@ int CUDPSocket::lookup(const std::string& hostname, unsigned short port, sockadd
|
||||||
/* Port is always digits, no needs to lookup service */
|
/* Port is always digits, no needs to lookup service */
|
||||||
hints.ai_flags |= AI_NUMERICSERV;
|
hints.ai_flags |= AI_NUMERICSERV;
|
||||||
|
|
||||||
int err = ::getaddrinfo(hostname.empty() ? nullptr : hostname.c_str(), portstr.c_str(), &hints, &res);
|
int err = ::getaddrinfo(hostname.empty() ? NULL : hostname.c_str(), portstr.c_str(), &hints, &res);
|
||||||
if (err != 0) {
|
if (err != 0) {
|
||||||
sockaddr_in* paddr = (sockaddr_in*)&addr;
|
sockaddr_in* paddr = (sockaddr_in*)&addr;
|
||||||
::memset(paddr, 0x00U, address_length = sizeof(sockaddr_in));
|
::memset(paddr, 0x00U, address_length = sizeof(sockaddr_in));
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue