commit 7849e467579f64ccbbfdc4463af97a215d1ac8e3
author Edward Thomson <ethomson@edwardthomson.com> Tue May 02 16:03:41 2017 +0100
committer GitHub <noreply@github.com> Tue May 02 16:03:41 2017 +0100
tree 3b88b7a1c492f0c4e86030a1060e5a8223edaf1a
parent 9cc0ba6babeaa22c10600255d28d144b377b7709
parent 2ce2a48f2dfe6a92c0418f5c00e955039fdd0b96

Merge pull request #4229 from pks-t/pks/ssh-memleaks

libssh2 shutdown

src/global.c

diff --git a/src/global.c b/src/global.c
index e2ad8fe..afa57e1 100644
--- a/src/global.c
+++ b/src/global.c
@@ -22,7 +22,7 @@
 
 git_mutex git__mwindow_mutex;
 
-#define MAX_SHUTDOWN_CB 8
+#define MAX_SHUTDOWN_CB 9
 
 static git_global_shutdown_fn git__shutdown_callbacks[MAX_SHUTDOWN_CB];
 static git_atomic git__n_shutdown_callbacks;

src/transports/ssh.c

diff --git a/src/transports/ssh.c b/src/transports/ssh.c
index 44d02e5..4c55e3f 100644
--- a/src/transports/ssh.c
+++ b/src/transports/ssh.c
@@ -9,6 +9,7 @@
 #include <libssh2.h>
 #endif
 
+#include "global.h"
 #include "git2.h"
 #include "buffer.h"
 #include "netops.h"
@@ -893,11 +894,22 @@
 #endif
 }
 
+#ifdef GIT_SSH
+static void shutdown_ssh(void)
+{
+    libssh2_exit();
+}
+#endif
+
 int git_transport_ssh_global_init(void)
 {
 #ifdef GIT_SSH
+	if (libssh2_init(0) < 0) {
+		giterr_set(GITERR_SSH, "unable to initialize libssh2");
+		return -1;
+	}
 
-	libssh2_init(0);
+	git__on_shutdown(shutdown_ssh);
 	return 0;
 
 #else