Commit b9895144 by Patrick Steinhardt

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.
parent 97e57e87
...@@ -261,6 +261,7 @@ int git_stransport_stream_new(git_stream **out, const char *host, const char *po ...@@ -261,6 +261,7 @@ int git_stransport_stream_new(git_stream **out, const char *host, const char *po
st->ctx = SSLCreateContext(NULL, kSSLClientSide, kSSLStreamType); st->ctx = SSLCreateContext(NULL, kSSLClientSide, kSSLStreamType);
if (!st->ctx) { if (!st->ctx) {
giterr_set(GITERR_NET, "failed to create SSL context"); giterr_set(GITERR_NET, "failed to create SSL context");
git__free(st);
return -1; return -1;
} }
...@@ -270,7 +271,8 @@ int git_stransport_stream_new(git_stream **out, const char *host, const char *po ...@@ -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 = SSLSetProtocolVersionMin(st->ctx, kTLSProtocol1)) != noErr ||
(ret = SSLSetProtocolVersionMax(st->ctx, kTLSProtocol12)) != noErr || (ret = SSLSetProtocolVersionMax(st->ctx, kTLSProtocol12)) != noErr ||
(ret = SSLSetPeerDomainName(st->ctx, host, strlen(host))) != 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); return stransport_error(ret);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment