diff options
author | Tay Ray Chuan <rctay89@gmail.com> | 2011-08-03 19:54:03 +0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-03 11:23:09 -0700 |
commit | ec99c9a89a65749093e16aed37d393f646597b31 (patch) | |
tree | 4b5457300e261960a65d5bb883db933aaa566249 /http.c | |
parent | b586744a864cf4d6886d6436d559302123b01fae (diff) | |
download | git-ec99c9a89a65749093e16aed37d393f646597b31.tar.gz git-ec99c9a89a65749093e16aed37d393f646597b31.tar.xz |
http.c: fix an invalid free()
Remove a free() on the static buffer returned by sha1_file_name().
While we're at it, replace xmalloc() calls on the structs
http_(object|pack)_request with xcalloc() so that pointers in the
structs get initialized to NULL. That way, free()'s are safe - for
example, a free() on the url string member when aborting.
This fixes an invalid free().
Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Helped-by: Jeff King peff@peff.net
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.c')
-rw-r--r-- | http.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1116,9 +1116,8 @@ struct http_pack_request *new_http_pack_request( struct strbuf buf = STRBUF_INIT; struct http_pack_request *preq; - preq = xmalloc(sizeof(*preq)); + preq = xcalloc(1, sizeof(*preq)); preq->target = target; - preq->range_header = NULL; end_url_with_slash(&buf, base_url); strbuf_addf(&buf, "objects/pack/pack-%s.pack", @@ -1210,7 +1209,7 @@ struct http_object_request *new_http_object_request(const char *base_url, struct curl_slist *range_header = NULL; struct http_object_request *freq; - freq = xmalloc(sizeof(*freq)); + freq = xcalloc(1, sizeof(*freq)); hashcpy(freq->sha1, sha1); freq->localfile = -1; @@ -1248,8 +1247,6 @@ struct http_object_request *new_http_object_request(const char *base_url, goto abort; } - memset(&freq->stream, 0, sizeof(freq->stream)); - git_inflate_init(&freq->stream); git_SHA1_Init(&freq->c); @@ -1324,7 +1321,6 @@ struct http_object_request *new_http_object_request(const char *base_url, return freq; abort: - free(filename); free(freq->url); free(freq); return NULL; |