summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2016-08-08 14:47:32 +0200
committerPatrick Steinhardt <ps@pks.im>2016-08-09 08:38:54 +0200
commitb989514405e2223f12040d3f940185378041c95c (patch)
tree757581717b88882f6b230991a1d30d8c7743fa65
parent97e57e8770132d61ff2c36bee2de2c7ac5c9d609 (diff)
downloadlibgit2-b989514405e2223f12040d3f940185378041c95c.tar.gz
stransport: do not use `git_stream_free` on uninitialized stransport
When failing to initialize a new stransport stream, we try to release already allocated memory by calling out to `git_stream_free`, which in turn called out to the stream's `free` function pointer. As we only initialize the function pointer later on, this leads to a `NULL` pointer exception. Furthermore, plug another memory leak when failing to create the SSL context.
-rw-r--r--src/stransport_stream.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/stransport_stream.c b/src/stransport_stream.c
index e568620e9..50ed9452c 100644
--- a/src/stransport_stream.c
+++ b/src/stransport_stream.c
@@ -261,6 +261,7 @@ int git_stransport_stream_new(git_stream **out, const char *host, const char *po
st->ctx = SSLCreateContext(NULL, kSSLClientSide, kSSLStreamType);
if (!st->ctx) {
giterr_set(GITERR_NET, "failed to create SSL context");
+ git__free(st);
return -1;
}
@@ -270,7 +271,8 @@ int git_stransport_stream_new(git_stream **out, const char *host, const char *po
(ret = SSLSetProtocolVersionMin(st->ctx, kTLSProtocol1)) != noErr ||
(ret = SSLSetProtocolVersionMax(st->ctx, kTLSProtocol12)) != noErr ||
(ret = SSLSetPeerDomainName(st->ctx, host, strlen(host))) != noErr) {
- git_stream_free((git_stream *)st);
+ CFRelease(st->ctx);
+ git__free(st);
return stransport_error(ret);
}