odbc: Avoid possible leak detection on driver unload

For debug Windows build if the ODBC driver is unloaded a leak detector is activated. It looks like from AppVeyor logs that sometimes during the leak detector some leak are detected. To avoid these false positive free memory before calling SQLFreeEnv (which could unload the driver from memory). Also decrease socket library counter calling WSACleanup(). Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
FreeTDS · Feb 5, 2025 · e3674e5 · e3674e5
1 parent d405d55
commit e3674e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/odbc/unittests/common.c b/src/odbc/unittests/common.c
@@ -314,6 +314,7 @@ odbc_disconnect(void)
 		odbc_conn = SQL_NULL_HDBC;
 	}
 
+	ODBC_FREE();
 	if (odbc_env) {
 		SQLFreeEnv(odbc_env);
 		odbc_env = SQL_NULL_HENV;

diff --git a/win32/initnet.c b/win32/initnet.c
@@ -38,6 +38,7 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved TDS_UNUSED)
 		break;
 
 	case DLL_PROCESS_DETACH:
+		tds_socket_done();
 #if defined(_MSC_VER) && defined(_DEBUG)
 		_CrtDumpMemoryLeaks();
 #endif