Commit ad2bf40a9d11d0b848d0b4a66a92aea8568609a4
2014-12-08T17:31:34
winhttp: plug some leaks
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c
index 032ac51..56b7c99 100644
--- a/src/transports/winhttp.c
+++ b/src/transports/winhttp.c
@@ -241,6 +241,31 @@ static int certificate_check(winhttp_stream *s, int valid)
return error;
}
+static void winhttp_stream_close(winhttp_stream *s)
+{
+ if (s->chunk_buffer) {
+ git__free(s->chunk_buffer);
+ s->chunk_buffer = NULL;
+ }
+
+ if (s->post_body) {
+ CloseHandle(s->post_body);
+ s->post_body = NULL;
+ }
+
+ if (s->request_uri) {
+ git__free(s->request_uri);
+ s->request_uri = NULL;
+ }
+
+ if (s->request) {
+ WinHttpCloseHandle(s->request);
+ s->request = NULL;
+ }
+
+ s->sent_request = 0;
+}
+
static int winhttp_stream_connect(winhttp_stream *s)
{
winhttp_subtransport *t = OWNING_SUBTRANSPORT(s);
@@ -420,6 +445,9 @@ static int winhttp_stream_connect(winhttp_stream *s)
error = 0;
on_error:
+ if (error < 0)
+ winhttp_stream_close(s);
+
git__free(proxy_url);
git_buf_free(&buf);
return error;
@@ -497,6 +525,31 @@ static int write_chunk(HINTERNET request, const char *buffer, size_t len)
return 0;
}
+static int winhttp_close_connection(winhttp_subtransport *t)
+{
+ int ret = 0;
+
+ if (t->connection) {
+ if (!WinHttpCloseHandle(t->connection)) {
+ giterr_set(GITERR_OS, "Unable to close connection");
+ ret = -1;
+ }
+
+ t->connection = NULL;
+ }
+
+ if (t->session) {
+ if (!WinHttpCloseHandle(t->session)) {
+ giterr_set(GITERR_OS, "Unable to close session");
+ ret = -1;
+ }
+
+ t->session = NULL;
+ }
+
+ return ret;
+}
+
static int winhttp_connect(
winhttp_subtransport *t,
const char *url)
@@ -510,6 +563,9 @@ static int winhttp_connect(
GIT_UNUSED(url);
+ t->session = NULL;
+ t->connection = NULL;
+
/* Prepare port */
if (git__strtol32(&port, t->connection_data.port, NULL, 10) < 0)
return -1;
@@ -554,6 +610,9 @@ static int winhttp_connect(
error = 0;
on_error:
+ if (error < 0)
+ winhttp_close_connection(t);
+
git__free(wide_host);
return error;
@@ -790,9 +849,7 @@ replay:
git__free(location);
/* Replay the request */
- WinHttpCloseHandle(s->request);
- s->request = NULL;
- s->sent_request = 0;
+ winhttp_stream_close(s);
if (!git__prefixcmp_icase(location8, prefix_https)) {
/* Upgrade to secure connection; disconnect and start over */
@@ -801,7 +858,10 @@ replay:
return -1;
}
- winhttp_connect(t, location8);
+ winhttp_close_connection(t);
+
+ if (winhttp_connect(t, location8) < 0)
+ return -1;
}
git__free(location8);
@@ -840,9 +900,7 @@ replay:
if (!cred_error) {
assert(t->cred);
- WinHttpCloseHandle(s->request);
- s->request = NULL;
- s->sent_request = 0;
+ winhttp_stream_close(s);
/* Successfully acquired a credential */
goto replay;
@@ -1109,26 +1167,7 @@ static void winhttp_stream_free(git_smart_subtransport_stream *stream)
{
winhttp_stream *s = (winhttp_stream *)stream;
- if (s->chunk_buffer) {
- git__free(s->chunk_buffer);
- s->chunk_buffer = NULL;
- }
-
- if (s->post_body) {
- CloseHandle(s->post_body);
- s->post_body = NULL;
- }
-
- if (s->request_uri) {
- git__free(s->request_uri);
- s->request_uri = NULL;
- }
-
- if (s->request) {
- WinHttpCloseHandle(s->request);
- s->request = NULL;
- }
-
+ winhttp_stream_close(s);
git__free(s);
}
@@ -1257,7 +1296,6 @@ static int winhttp_action(
static int winhttp_close(git_smart_subtransport *subtransport)
{
winhttp_subtransport *t = (winhttp_subtransport *)subtransport;
- int ret = 0;
gitno_connection_data_free_ptrs(&t->connection_data);
memset(&t->connection_data, 0x0, sizeof(gitno_connection_data));
@@ -1272,25 +1310,7 @@ static int winhttp_close(git_smart_subtransport *subtransport)
t->url_cred = NULL;
}
- if (t->connection) {
- if (!WinHttpCloseHandle(t->connection)) {
- giterr_set(GITERR_OS, "Unable to close connection");
- ret = -1;
- }
-
- t->connection = NULL;
- }
-
- if (t->session) {
- if (!WinHttpCloseHandle(t->session)) {
- giterr_set(GITERR_OS, "Unable to close session");
- ret = -1;
- }
-
- t->session = NULL;
- }
-
- return ret;
+ return winhttp_close_connection(t);
}
static void winhttp_free(git_smart_subtransport *subtransport)