Skip to content

Commit 81cd36d

Browse files
Fix #14155 FP resourceLeak with socket() and windows.cfg (danmar#8133)
1 parent 0393c9d commit 81cd36d

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

cfg/windows.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7191,7 +7191,7 @@ HFONT CreateFont(
71917191
<define name="AFX_EXT_CLASS" value=""/>
71927192
<define name="DEBUG_NEW" value="new"/>
71937193
<define name="INVALID_HANDLE_VALUE" value="-1"/>
7194-
<define name="INVALID_SOCKET" value="~0"/>
7194+
<define name="INVALID_SOCKET" value="-1"/>
71957195
<define name="WINAPI" value="__stdcall"/>
71967196
<define name="STDMETHODCALLTYPE" value="__stdcall"/>
71977197
<define name="STDMETHODIMP" value="HRESULT STDMETHODCALLTYPE"/>

test/cfg/windows.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ void invalid_socket()
5454
// cppcheck-suppress resourceLeak
5555
}
5656

57+
void invalid_socket_noleak(int a, int t, int p) { // #14155
58+
SOCKET s = socket(a, t, p);
59+
if (s == INVALID_SOCKET)
60+
return;
61+
closesocket(s);
62+
}
63+
5764
void resourceLeak_OpenThread(const DWORD dwDesiredAccess, const BOOL bInheritHandle, const DWORD dwThreadId)
5865
{
5966
HANDLE proc = OpenThread(dwDesiredAccess, bInheritHandle, dwThreadId);

0 commit comments

Comments
 (0)