proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-03 22:01:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
libssh2 shutdown
This commit is contained in:
Edward Thomson 2017-05-02 16:03:41 +01:00 committed by GitHub
commit 7849e46757
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/global.c
View File

@ -22,7 +22,7 @@
git_mutex git__mwindow_mutex; 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_global_shutdown_fn git__shutdown_callbacks[MAX_SHUTDOWN_CB];
static git_atomic git__n_shutdown_callbacks; static git_atomic git__n_shutdown_callbacks;

14
src/transports/ssh.c
View File

@ -9,6 +9,7 @@
#include <libssh2.h> #include <libssh2.h>
#endif #endif
#include "global.h"
#include "git2.h" #include "git2.h"
#include "buffer.h" #include "buffer.h"
#include "netops.h" #include "netops.h"
@ -893,11 +894,22 @@ int git_transport_ssh_with_paths(git_transport **out, git_remote *owner, void *p
#endif #endif
} }
#ifdef GIT_SSH
static void shutdown_ssh(void)
{
libssh2_exit();
}
#endif
int git_transport_ssh_global_init(void) int git_transport_ssh_global_init(void)
{ {
#ifdef GIT_SSH #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; return 0;
#else #else