Merge branch 'v1.7_backports' into maint/v1.7

ethomson · ethomson · commit 0ddc07763d04 · 2023-08-02T21:35:53.000+01:00
diff --git a/include/git2/sys/transport.h b/include/git2/sys/transport.h
@@ -9,6 +9,7 @@
 #define INCLUDE_sys_git_transport_h
 
 #include "git2/net.h"
+#include "git2/oidarray.h"
 #include "git2/proxy.h"
 #include "git2/remote.h"
 #include "git2/strarray.h"
diff --git a/src/libgit2/repository.c b/src/libgit2/repository.c
@@ -153,7 +153,9 @@ int git_repository__cleanup(git_repository *repo)
 	git_cache_clear(&repo->objects);
 	git_attr_cache_flush(repo);
 	git_grafts_free(repo->grafts);
+	repo->grafts = NULL;
 	git_grafts_free(repo->shallow_grafts);
+	repo->shallow_grafts = NULL;
 
 	set_config(repo, NULL);
 	set_index(repo, NULL);
diff --git a/src/libgit2/streams/stransport.c b/src/libgit2/streams/stransport.c
@@ -162,7 +162,7 @@ static OSStatus write_cb(SSLConnectionRef conn, const void *data, size_t *len)
 	if (ret < 0) {
 		st->error = ret;
 		return (ret == GIT_TIMEOUT) ?
-		       errSSLNetworkTimeout :
+		       -9853 /* errSSLNetworkTimeout */:
 		       -36 /* ioErr */;
 	}
 
@@ -214,7 +214,7 @@ static OSStatus read_cb(SSLConnectionRef conn, void *data, size_t *len)
 		if (ret < 0) {
 			st->error = ret;
 			error = (ret == GIT_TIMEOUT) ?
-			        errSSLNetworkTimeout :
+			        -9853 /* errSSLNetworkTimeout */:
 			        -36 /* ioErr */;
 			break;
 		} else if (ret == 0) {
diff --git a/src/libgit2/transports/ssh.c b/src/libgit2/transports/ssh.c
@@ -877,11 +877,12 @@ static int _git_ssh_setup_conn(
 	t->current_stream = s;
 
 done:
+	if (known_hosts)
+		libssh2_knownhost_free(known_hosts);
+
 	if (error < 0) {
 		ssh_stream_free(*stream);
 
-		if (known_hosts)
-			libssh2_knownhost_free(known_hosts);
 		if (session)
 			libssh2_session_free(session);
 	}
