winhttp: Clean up locks after closing libssl and libcrypto.

SSL_CTX_free() triggers a call to the locking callback. Found by valgrind.

winhttp: Clean up locks after closing libssl and libcrypto.
629fd8fc · Hans Leidekker · Alexandre Julliard · e62fdaf0 · 629fd8fc
Commit 629fd8fc authored Oct 27, 2009 by Hans Leidekker Committed by Alexandre Julliard Oct 27, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

net.c dlls/winhttp/net.c +6 -7

No files found.
--- a/dlls/winhttp/net.c
+++ b/dlls/winhttp/net.c
@@ -316,13 +316,6 @@ void netconn_unload( void )
 #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO)
    if (libcrypto_handle)
    {
-        if (ssl_locks)
-        {
-            int i;
-
-            for (i = 0; i < num_ssl_locks; i++) DeleteCriticalSection( &ssl_locks[i] );
-            HeapFree( GetProcessHeap(), 0, ssl_locks );
-        }
        wine_dlclose( libcrypto_handle, NULL, 0 );
    }
    if (libssl_handle)
@@ -331,6 +324,12 @@ void netconn_unload( void )
            pSSL_CTX_free( ctx );
        wine_dlclose( libssl_handle, NULL, 0 );
    }
+    if (ssl_locks)
+    {
+        int i;
+        for (i = 0; i < num_ssl_locks; i++) DeleteCriticalSection( &ssl_locks[i] );
+        HeapFree( GetProcessHeap(), 0, ssl_locks );
+    }
 #endif
 }