git-verify-pack: free pack after use and a cleanup
Plug memory leak in verify_one_pack() by freeing the struct packed_git we got from add_packed_git(). Also rename g to pack and pull an assignment out of an if statement while we're at it. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
fc5fc50980
commit
d0d619c8c5
@ -5,7 +5,8 @@ static int verify_one_pack(const char *path, int verbose)
|
|||||||
{
|
{
|
||||||
char arg[PATH_MAX];
|
char arg[PATH_MAX];
|
||||||
int len;
|
int len;
|
||||||
struct packed_git *g;
|
struct packed_git *pack;
|
||||||
|
int err;
|
||||||
|
|
||||||
len = strlcpy(arg, path, PATH_MAX);
|
len = strlcpy(arg, path, PATH_MAX);
|
||||||
if (len >= PATH_MAX)
|
if (len >= PATH_MAX)
|
||||||
@ -25,10 +26,14 @@ static int verify_one_pack(const char *path, int verbose)
|
|||||||
len += 4;
|
len += 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(g = add_packed_git(arg, len, 1)))
|
pack = add_packed_git(arg, len, 1);
|
||||||
|
if (!pack)
|
||||||
return error("packfile %s not found.", arg);
|
return error("packfile %s not found.", arg);
|
||||||
|
|
||||||
return verify_pack(g, verbose);
|
err = verify_pack(pack, verbose);
|
||||||
|
free(pack);
|
||||||
|
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char verify_pack_usage[] = "git-verify-pack [-v] <pack>...";
|
static const char verify_pack_usage[] = "git-verify-pack [-v] <pack>...";
|
||||||
|
Loading…
Reference in New Issue
Block a user