Fix nasty bug in UDPSocket::close().

f1rmb · f1rmb · commit c08b41a17a64 · 2021-03-31T13:34:31.000+02:00
diff --git a/UDPSocket.cpp b/UDPSocket.cpp
@@ -188,6 +188,8 @@ bool CUDPSocket::open(const unsigned int index, const unsigned int af, const std
 		return false;
 	}
 
+	close(index);
+
 	int fd = ::socket(addr.ss_family, SOCK_DGRAM, 0);
 	if (fd < 0) {
 #if defined(_WIN32) || defined(_WIN64)
@@ -344,13 +346,13 @@ bool CUDPSocket::write(const unsigned char* buffer, unsigned int length, const s
 
 void CUDPSocket::close()
 {
-	for (int i = 0; i < UDP_SOCKET_MAX; i++)
-		close(m_fd[i]);
+	for (unsigned int i = 0; i < UDP_SOCKET_MAX; i++)
+		close(i);
 }
 
 void CUDPSocket::close(const unsigned int index)
 {
- 	if (m_fd[index] >= 0) {
+	if ((index < UDP_SOCKET_MAX) && (m_fd[index] >= 0)) {
 #if defined(_WIN32) || defined(_WIN64)
 		::closesocket(m_fd[index]);
 #else

Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,8 @@ bool CUDPSocket::open(const unsigned int index, const unsigned int af, const std`
`188`	`188`	`return false;`
`189`	`189`	`}`
`190`	`190`
	`191`	`+ close(index);`
	`192`	`+`
`191`	`193`	`int fd = ::socket(addr.ss_family, SOCK_DGRAM, 0);`
`192`	`194`	`if (fd < 0) {`
`193`	`195`	`#if defined(_WIN32) \|\| defined(_WIN64)`
`@@ -344,13 +346,13 @@ bool CUDPSocket::write(const unsigned char* buffer, unsigned int length, const s`
`344`	`346`
`345`	`347`	`void CUDPSocket::close()`
`346`	`348`	`{`
`347`		`- for (int i = 0; i < UDP_SOCKET_MAX; i++)`
`348`		`- close(m_fd[i]);`
	`349`	`+ for (unsigned int i = 0; i < UDP_SOCKET_MAX; i++)`
	`350`	`+ close(i);`
`349`	`351`	`}`
`350`	`352`
`351`	`353`	`void CUDPSocket::close(const unsigned int index)`
`352`	`354`	`{`
`353`		`- if (m_fd[index] >= 0) {`
	`355`	`+ if ((index < UDP_SOCKET_MAX) && (m_fd[index] >= 0)) {`
`354`	`356`	`#if defined(_WIN32) \|\| defined(_WIN64)`
`355`	`357`	`::closesocket(m_fd[index]);`
`356`	`358`	`#else`