http-push: free transfer_request strbuf
When we issue a PUT, we initialize and fill a strbuf embedded in the transfer_request struct. But we never release this buffer, causing a leak. We can fix this by adding a strbuf_release() call to release_request(). If we stopped there, then non-PUT requests would try to release a zero-initialized strbuf. This works OK in practice, but we should try to follow the strbuf API more closely. So instead, we'll always initialize the strbuf when we create the transfer_request struct. That in turn means switching the strbuf_init() call in start_put() to a simple strbuf_grow(). This leak is triggered in t5540. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
7d3c71ddbf
commit
94c6285780
@ -375,7 +375,7 @@ static void start_put(struct transfer_request *request)
|
|||||||
/* Set it up */
|
/* Set it up */
|
||||||
git_deflate_init(&stream, zlib_compression_level);
|
git_deflate_init(&stream, zlib_compression_level);
|
||||||
size = git_deflate_bound(&stream, len + hdrlen);
|
size = git_deflate_bound(&stream, len + hdrlen);
|
||||||
strbuf_init(&request->buffer.buf, size);
|
strbuf_grow(&request->buffer.buf, size);
|
||||||
request->buffer.posn = 0;
|
request->buffer.posn = 0;
|
||||||
|
|
||||||
/* Compress it */
|
/* Compress it */
|
||||||
@ -515,6 +515,7 @@ static void release_request(struct transfer_request *request)
|
|||||||
|
|
||||||
free(request->url);
|
free(request->url);
|
||||||
free(request->dest);
|
free(request->dest);
|
||||||
|
strbuf_release(&request->buffer.buf);
|
||||||
free(request);
|
free(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -655,6 +656,7 @@ static void add_fetch_request(struct object *obj)
|
|||||||
CALLOC_ARRAY(request, 1);
|
CALLOC_ARRAY(request, 1);
|
||||||
request->obj = obj;
|
request->obj = obj;
|
||||||
request->state = NEED_FETCH;
|
request->state = NEED_FETCH;
|
||||||
|
strbuf_init(&request->buffer.buf, 0);
|
||||||
request->next = request_queue_head;
|
request->next = request_queue_head;
|
||||||
request_queue_head = request;
|
request_queue_head = request;
|
||||||
|
|
||||||
@ -689,6 +691,7 @@ static int add_send_request(struct object *obj, struct remote_lock *lock)
|
|||||||
request->obj = obj;
|
request->obj = obj;
|
||||||
request->lock = lock;
|
request->lock = lock;
|
||||||
request->state = NEED_PUSH;
|
request->state = NEED_PUSH;
|
||||||
|
strbuf_init(&request->buffer.buf, 0);
|
||||||
request->next = request_queue_head;
|
request->next = request_queue_head;
|
||||||
request_queue_head = request;
|
request_queue_head = request;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user