Commit e87f912b55e321484581f317b0f3ca1ff5afe98a
2019-03-21T15:29:52
http: don't realloc the request
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
diff --git a/src/transports/http.c b/src/transports/http.c
index 453b910..bb38b68 100644
--- a/src/transports/http.c
+++ b/src/transports/http.c
@@ -1017,6 +1017,8 @@ static int http_stream_read(
http_subtransport *t = OWNING_SUBTRANSPORT(s);
parser_context ctx;
size_t bytes_parsed;
+ git_buf request = GIT_BUF_INIT;
+ int error = 0;
replay:
*bytes_read = 0;
@@ -1024,20 +1026,12 @@ replay:
assert(t->connected);
if (!s->sent_request) {
- git_buf request = GIT_BUF_INIT;
-
+ git_buf_clear(&request);
clear_parser_state(t);
- if (gen_request(&request, s, 0) < 0)
- return -1;
-
- if (git_stream__write_full(t->server.stream, request.ptr,
- request.size, 0) < 0) {
- git_buf_dispose(&request);
- return -1;
- }
-
- git_buf_dispose(&request);
+ if ((error = gen_request(&request, s, 0)) < 0 ||
+ (error = git_stream__write_full(t->server.stream, request.ptr, request.size, 0)) < 0)
+ goto done;
s->sent_request = 1;
}
@@ -1047,17 +1041,17 @@ replay:
assert(s->verb == post_verb);
/* Flush, if necessary */
- if (s->chunk_buffer_len > 0 &&
- write_chunk(t->server.stream,
- s->chunk_buffer, s->chunk_buffer_len) < 0)
- return -1;
+ if (s->chunk_buffer_len > 0) {
+ if ((error = write_chunk(t->server.stream, s->chunk_buffer, s->chunk_buffer_len)) < 0)
+ goto done;
- s->chunk_buffer_len = 0;
+ s->chunk_buffer_len = 0;
+ }
/* Write the final chunk. */
- if (git_stream__write_full(t->server.stream,
- "0\r\n\r\n", 5, 0) < 0)
- return -1;
+ if ((error = git_stream__write_full(t->server.stream,
+ "0\r\n\r\n", 5, 0)) < 0)
+ goto done;
}
s->received_response = 1;
@@ -1065,7 +1059,6 @@ replay:
while (!*bytes_read && !t->parse_finished) {
size_t data_offset;
- int error;
/*
* Make the parse_buffer think it's as full of data as
@@ -1075,16 +1068,15 @@ replay:
* data_offset is the actual data offset from which we
* should tell the parser to start reading.
*/
- if (buf_size >= t->parse_buffer.len) {
+ if (buf_size >= t->parse_buffer.len)
t->parse_buffer.offset = 0;
- } else {
+ else
t->parse_buffer.offset = t->parse_buffer.len - buf_size;
- }
data_offset = t->parse_buffer.offset;
- if (gitno_recv(&t->parse_buffer) < 0)
- return -1;
+ if ((error = gitno_recv(&t->parse_buffer)) < 0)
+ goto done;
/* This call to http_parser_execute will result in invocations of the
* on_* family of callbacks. The most interesting of these is
@@ -1113,27 +1105,31 @@ replay:
s->sent_request = 0;
if ((error = http_connect(t)) < 0)
- return error;
+ goto done;
goto replay;
}
if (t->parse_error == PARSE_ERROR_EXT) {
- return t->error;
+ error = t->error;
+ goto done;
+ } else if (t->parse_error < 0) {
+ error = -1;
+ goto done;
}
- if (t->parse_error < 0)
- return -1;
-
if (bytes_parsed != t->parse_buffer.offset - data_offset) {
git_error_set(GIT_ERROR_NET,
"HTTP parser error: %s",
http_errno_description((enum http_errno)t->parser.http_errno));
- return -1;
+ error = -1;
+ goto done;
}
}
- return 0;
+done:
+ git_buf_dispose(&request);
+ return error;
}
static int http_stream_write_chunked(