undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkout-index: plug memory leak from prefix_path()

Browse Source 
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:
Junio C Hamano 2006-05-05 22:38:06 -07:00
parent 09895c1fa0
commit dc46da2286
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
checkout-index.c
View File

@ -269,12 +269,16 @@ int main(int argc, char **argv)
/* Check out named files first */ /* Check out named files first */
for ( ; i < argc; i++) { for ( ; i < argc; i++) {
const char *arg = argv[i]; const char *arg = argv[i];
const char *p;
if (all) if (all)
die("git-checkout-index: don't mix '--all' and explicit filenames"); die("git-checkout-index: don't mix '--all' and explicit filenames");
if (read_from_stdin) if (read_from_stdin)
die("git-checkout-index: don't mix '--stdin' and explicit filenames"); 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) { if (read_from_stdin) {
@ -284,6 +288,8 @@ int main(int argc, char **argv)
strbuf_init(&buf); strbuf_init(&buf);
while (1) { while (1) {
char *path_name; char *path_name;
const char *p;
read_line(&buf, stdin, line_termination); read_line(&buf, stdin, line_termination);
if (buf.eof) if (buf.eof)
break; break;
@ -291,7 +297,10 @@ int main(int argc, char **argv)
path_name = unquote_c_style(buf.buf, NULL); path_name = unquote_c_style(buf.buf, NULL);
else else
path_name = buf.buf; 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) if (path_name != buf.buf)
free(path_name); free(path_name);
} }