提交 fb69a760 编写于 作者: J Junio C Hamano

update-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: NJunio C Hamano <junkio@cox.net>
上级 dc46da22
...@@ -364,23 +364,26 @@ static void update_one(const char *path, const char *prefix, int prefix_length) ...@@ -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); const char *p = prefix_path(prefix, prefix_length, path);
if (!verify_path(p)) { if (!verify_path(p)) {
fprintf(stderr, "Ignoring path %s\n", path); fprintf(stderr, "Ignoring path %s\n", path);
return; goto free_return;
} }
if (mark_valid_only) { if (mark_valid_only) {
if (mark_valid(p)) if (mark_valid(p))
die("Unable to mark file %s", path); die("Unable to mark file %s", path);
return; goto free_return;
} }
if (force_remove) { if (force_remove) {
if (remove_file_from_cache(p)) if (remove_file_from_cache(p))
die("git-update-index: unable to remove %s", path); die("git-update-index: unable to remove %s", path);
report("remove '%s'", path); report("remove '%s'", path);
return; goto free_return;
} }
if (add_file_to_cache(p)) if (add_file_to_cache(p))
die("Unable to process file %s", path); die("Unable to process file %s", path);
report("add '%s'", path); report("add '%s'", path);
free_return:
if (p != path)
free((char*)p);
} }
static void read_index_info(int line_termination) static void read_index_info(int line_termination)
...@@ -735,6 +738,7 @@ int main(int argc, const char **argv) ...@@ -735,6 +738,7 @@ int main(int argc, const 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;
...@@ -742,11 +746,12 @@ int main(int argc, const char **argv) ...@@ -742,11 +746,12 @@ int main(int argc, const 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;
update_one(path_name, prefix, prefix_length); p = prefix_path(prefix, prefix_length, path_name);
if (set_executable_bit) { update_one(p, NULL, 0);
const char *p = prefix_path(prefix, prefix_length, path_name); if (set_executable_bit)
chmod_path(set_executable_bit, p); chmod_path(set_executable_bit, p);
} if (p != path_name)
free((char*) p);
if (path_name != buf.buf) if (path_name != buf.buf)
free(path_name); free(path_name);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册