checkout-index: plug memory leak from prefix_path()
prefix_path() sometimes allocates new memory and returns it, and other times returns the incoming path argument intact. The callers need to be a bit careful not to leak memory. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
09895c1fa0
commit
dc46da2286
@ -269,12 +269,16 @@ int main(int argc, char **argv)
|
||||
/* Check out named files first */
|
||||
for ( ; i < argc; i++) {
|
||||
const char *arg = argv[i];
|
||||
const char *p;
|
||||
|
||||
if (all)
|
||||
die("git-checkout-index: don't mix '--all' and explicit filenames");
|
||||
if (read_from_stdin)
|
||||
die("git-checkout-index: don't mix '--stdin' and explicit filenames");
|
||||
checkout_file(prefix_path(prefix, prefix_length, arg));
|
||||
p = prefix_path(prefix, prefix_length, arg);
|
||||
checkout_file(p);
|
||||
if (p != arg)
|
||||
free((char*)p);
|
||||
}
|
||||
|
||||
if (read_from_stdin) {
|
||||
@ -284,6 +288,8 @@ int main(int argc, char **argv)
|
||||
strbuf_init(&buf);
|
||||
while (1) {
|
||||
char *path_name;
|
||||
const char *p;
|
||||
|
||||
read_line(&buf, stdin, line_termination);
|
||||
if (buf.eof)
|
||||
break;
|
||||
@ -291,7 +297,10 @@ int main(int argc, char **argv)
|
||||
path_name = unquote_c_style(buf.buf, NULL);
|
||||
else
|
||||
path_name = buf.buf;
|
||||
checkout_file(prefix_path(prefix, prefix_length, path_name));
|
||||
p = prefix_path(prefix, prefix_length, path_name);
|
||||
checkout_file(p);
|
||||
if (p != path_name)
|
||||
free((char *)p);
|
||||
if (path_name != buf.buf)
|
||||
free(path_name);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user