From: Junio C Hamano <junkio@cox.net>
Date: Sat, 6 May 2006 05:38:06 +0000 (-0700)
Subject: checkout-index: plug memory leak from prefix_path()
X-Git-Tag: v1.4.0-rc1~168
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc46da2286cf0d42e1e5ebbd272c201dbc3a626a;p=git.git

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>
---

diff --git a/checkout-index.c b/checkout-index.c
index dd6a2d86f..0b9cabc61 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);
 		}