X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=checkout-index.c;h=9876af6fd60a81d871e6be30060cc93d0e0259c7;hb=b3ca4e4ebba6915ea534c4b82cfc5d6f10b4c283;hp=7b78715417039fe1d43699270cdc3d5adf6d2e9c;hpb=2593a410e095f89f0eef40edb90b39029574462b;p=git.git

diff --git a/checkout-index.c b/checkout-index.c
index 7b787154..9876af6f 100644
--- a/checkout-index.c
+++ b/checkout-index.c
@@ -39,6 +39,7 @@
 #include "cache.h"
 #include "strbuf.h"
 #include "quote.h"
+#include "cache-tree.h"
 
 #define CHECKOUT_ALL 4
 static const char *prefix;
@@ -133,7 +134,7 @@ static int checkout_file(const char *name)
 static int checkout_all(void)
 {
 	int i, errs = 0;
-	struct cache_entry* last_ce = 0;
+	struct cache_entry* last_ce = NULL;
 
 	for (i = 0; i < active_nr ; i++) {
 		struct cache_entry *ce = active_cache[i];
@@ -269,12 +270,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 || p > arg + strlen(arg))
+			free((char*)p);
 	}
 
 	if (read_from_stdin) {
@@ -284,6 +289,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 +298,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 || p > path_name + strlen(path_name))
+				free((char *)p);
 			if (path_name != buf.buf)
 				free(path_name);
 		}