mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bundle: plug minor memory leak in is_tag_in_date_range()

Browse Source 
Free the buffer returned by read_sha1_file() even if no valid tagger
line is found.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2014-10-04 00:40:24 +02:00
committed by Junio C Hamano
parent 80b616d04b
commit 64045940af
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bundle.c
View File

@ -209,26 +209,29 @@ static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
{ {
unsigned long size; unsigned long size;
enum object_type type; enum object_type type;
char *buf, *line, *lineend; char *buf = NULL, *line, *lineend;
unsigned long date; unsigned long date;
int result = 1;
if (revs->max_age == -1 && revs->min_age == -1) if (revs->max_age == -1 && revs->min_age == -1)
return 1; goto out;
buf = read_sha1_file(tag->sha1, &type, &size); buf = read_sha1_file(tag->sha1, &type, &size);
if (!buf) if (!buf)
return 1; goto out;
line = memmem(buf, size, "\ntagger ", 8); line = memmem(buf, size, "\ntagger ", 8);
if (!line++) if (!line++)
return 1; goto out;
lineend = memchr(line, '\n', buf + size - line); lineend = memchr(line, '\n', buf + size - line);
line = memchr(line, '>', lineend ? lineend - line : buf + size - line); line = memchr(line, '>', lineend ? lineend - line : buf + size - line);
if (!line++) if (!line++)
return 1; goto out;
date = strtoul(line, NULL, 10); date = strtoul(line, NULL, 10);
free(buf); result = (revs->max_age == -1 || revs->max_age < date) &&
return (revs->max_age == -1 || revs->max_age < date) &&
(revs->min_age == -1 || revs->min_age > date); (revs->min_age == -1 || revs->min_age > date);
out:
free(buf);
return result;
} }
int create_bundle(struct bundle_header *header, const char *path, int create_bundle(struct bundle_header *header, const char *path,