summaryrefslogtreecommitdiff
path: root/checkout-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-06 05:38:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-06 05:40:45 (GMT)
commitdc46da2286cf0d42e1e5ebbd272c201dbc3a626a (patch)
tree53cad8038a2d026e80df20df1ff35f4191f4cd94 /checkout-index.c
parent09895c1fa02f77acb2bde3d7e9da675eeb1271cf (diff)
downloadgit-dc46da2286cf0d42e1e5ebbd272c201dbc3a626a.zip
git-dc46da2286cf0d42e1e5ebbd272c201dbc3a626a.tar.gz
git-dc46da2286cf0d42e1e5ebbd272c201dbc3a626a.tar.bz2
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>
Diffstat (limited to 'checkout-index.c')
-rw-r--r--checkout-index.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/checkout-index.c b/checkout-index.c
index dd6a2d8..0b9cabc 100644
--- a/checkout-index.c
+++ b/checkout-index.c
@@ -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);
}