projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix users of prefix_path() to free() only when necessary
[git.git]
/
update-index.c
diff --git
a/update-index.c
b/update-index.c
index
9fa3d2b
..
00cde70
100644
(file)
--- a/
update-index.c
+++ b/
update-index.c
@@
-364,23
+364,26
@@
static void update_one(const char *path, const char *prefix, int prefix_length)
const char *p = prefix_path(prefix, prefix_length, path);
if (!verify_path(p)) {
fprintf(stderr, "Ignoring path %s\n", path);
const char *p = prefix_path(prefix, prefix_length, path);
if (!verify_path(p)) {
fprintf(stderr, "Ignoring path %s\n", path);
- return;
+
goto free_
return;
}
if (mark_valid_only) {
if (mark_valid(p))
die("Unable to mark file %s", path);
}
if (mark_valid_only) {
if (mark_valid(p))
die("Unable to mark file %s", path);
- return;
+
goto free_
return;
}
if (force_remove) {
if (remove_file_from_cache(p))
die("git-update-index: unable to remove %s", path);
report("remove '%s'", path);
}
if (force_remove) {
if (remove_file_from_cache(p))
die("git-update-index: unable to remove %s", path);
report("remove '%s'", path);
- return;
+
goto free_
return;
}
if (add_file_to_cache(p))
die("Unable to process file %s", path);
report("add '%s'", path);
}
if (add_file_to_cache(p))
die("Unable to process file %s", path);
report("add '%s'", path);
+ free_return:
+ if (p < path || p > path + strlen(path))
+ free((char*)p);
}
static void read_index_info(int line_termination)
}
static void read_index_info(int line_termination)
@@
-576,7
+579,8
@@
static void read_head_pointers(void)
}
}
}
}
-static int do_unresolve(int ac, const char **av)
+static int do_unresolve(int ac, const char **av,
+ const char *prefix, int prefix_length)
{
int i;
int err = 0;
{
int i;
int err = 0;
@@
-588,7
+592,10
@@
static int do_unresolve(int ac, const char **av)
for (i = 1; i < ac; i++) {
const char *arg = av[i];
for (i = 1; i < ac; i++) {
const char *arg = av[i];
- err |= unresolve_one(arg);
+ const char *p = prefix_path(prefix, prefix_length, arg);
+ err |= unresolve_one(p);
+ if (p < arg || p > arg + strlen(arg))
+ free((char*)p);
}
return err;
}
}
return err;
}
@@
-704,7
+711,8
@@
int main(int argc, const char **argv)
break;
}
if (!strcmp(path, "--unresolve")) {
break;
}
if (!strcmp(path, "--unresolve")) {
- has_errors = do_unresolve(argc - i, argv + i);
+ has_errors = do_unresolve(argc - i, argv + i,
+ prefix, prefix_length);
if (has_errors)
active_cache_changed = 0;
goto finish;
if (has_errors)
active_cache_changed = 0;
goto finish;
@@
-730,6
+738,7
@@
int main(int argc, const char **argv)
strbuf_init(&buf);
while (1) {
char *path_name;
strbuf_init(&buf);
while (1) {
char *path_name;
+ const char *p;
read_line(&buf, stdin, line_termination);
if (buf.eof)
break;
read_line(&buf, stdin, line_termination);
if (buf.eof)
break;
@@
-737,11
+746,12
@@
int main(int argc, const char **argv)
path_name = unquote_c_style(buf.buf, NULL);
else
path_name = buf.buf;
path_name = unquote_c_style(buf.buf, NULL);
else
path_name = buf.buf;
-
update_one(path_name, prefix, prefix_length
);
- if (set_executable_bit) {
- const char *p = prefix_path(prefix, prefix_length, path_name);
+
p = prefix_path(prefix, prefix_length, path_name
);
+ update_one(p, NULL, 0);
+ if (set_executable_bit)
chmod_path(set_executable_bit, p);
chmod_path(set_executable_bit, p);
- }
+ if (p < path_name || p > path_name + strlen(path_name))
+ free((char*) p);
if (path_name != buf.buf)
free(path_name);
}
if (path_name != buf.buf)
free(path_name);
}