Merge branch 'openssl-lock-free'

carlosmn · carlosmn · commit 8aa707376a4e · 2014-11-17T14:03:50.000+01:00
diff --git a/src/global.c b/src/global.c
@@ -67,7 +67,13 @@ void openssl_locking_function(int mode, int n, const char *file, int line)
 
 static void shutdown_ssl_locking(void)
 {
+	int num_locks, i;
+
+	num_locks = CRYPTO_num_locks();
 	CRYPTO_set_locking_callback(NULL);
+
+	for (i = 0; i < num_locks; ++i)
+		git_mutex_free(openssl_locks);
 	git__free(openssl_locks);
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,13 @@ void openssl_locking_function(int mode, int n, const char *file, int line)`
`67`	`67`
`68`	`68`	`static void shutdown_ssl_locking(void)`
`69`	`69`	`{`
	`70`	`+ int num_locks, i;`
	`71`	`+`
	`72`	`+ num_locks = CRYPTO_num_locks();`
`70`	`73`	`CRYPTO_set_locking_callback(NULL);`
	`74`	`+`
	`75`	`+ for (i = 0; i < num_locks; ++i)`
	`76`	`+ git_mutex_free(openssl_locks);`
`71`	`77`	`git__free(openssl_locks);`
`72`	`78`	`}`
`73`	`79`	`#endif`