kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Tay Ray Chuan 2011-08-03 19:54:03 +08:00 committed by Junio C Hamano
parent b586744a86
commit ec99c9a89a
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
http.c
View File

@ -1116,9 +1116,8 @@ struct http_pack_request *new_http_pack_request(
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct http_pack_request *preq; struct http_pack_request *preq;


preq = xmalloc(sizeof(*preq)); preq = xcalloc(1, sizeof(*preq));
preq->target = target; preq->target = target;
preq->range_header = NULL;


end_url_with_slash(&buf, base_url); end_url_with_slash(&buf, base_url);
strbuf_addf(&buf, "objects/pack/pack-%s.pack", 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 curl_slist *range_header = NULL;
struct http_object_request *freq; struct http_object_request *freq;


freq = xmalloc(sizeof(*freq)); freq = xcalloc(1, sizeof(*freq));
hashcpy(freq->sha1, sha1); hashcpy(freq->sha1, sha1);
freq->localfile = -1; freq->localfile = -1;


@ -1248,8 +1247,6 @@ struct http_object_request *new_http_object_request(const char *base_url,
goto abort; goto abort;
} }


memset(&freq->stream, 0, sizeof(freq->stream));

git_inflate_init(&freq->stream); git_inflate_init(&freq->stream);


git_SHA1_Init(&freq->c); git_SHA1_Init(&freq->c);
@ -1324,7 +1321,6 @@ struct http_object_request *new_http_object_request(const char *base_url,
return freq; return freq;


abort: abort:
free(filename);
free(freq->url); free(freq->url);
free(freq); free(freq);
return NULL; return NULL;