undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/reupdate' into next

Browse Source 
* jc/reupdate:
  Fix users of prefix_path() to free() only when necessary
This commit is contained in:
Junio C Hamano 2006-05-06 21:47:07 -07:00
commit e04156a437
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
checkout-index.c
View File

@ -278,7 +278,7 @@ int main(int argc, char **argv)
die("git-checkout-index: don't mix '--stdin' and explicit filenames"); die("git-checkout-index: don't mix '--stdin' and explicit filenames");
p = prefix_path(prefix, prefix_length, arg); p = prefix_path(prefix, prefix_length, arg);
checkout_file(p); checkout_file(p);
if (p != arg) if (p < arg || p > arg + strlen(arg))
free((char*)p); free((char*)p);
} }
@ -300,7 +300,7 @@ int main(int argc, char **argv)
path_name = buf.buf; path_name = buf.buf;
p = prefix_path(prefix, prefix_length, path_name); p = prefix_path(prefix, prefix_length, path_name);
checkout_file(p); checkout_file(p);
if (p != path_name) if (p < path_name || p > path_name + strlen(path_name))
free((char *)p); free((char *)p);
if (path_name != buf.buf) if (path_name != buf.buf)
free(path_name); free(path_name);

8
update-index.c
View File

@ -393,7 +393,7 @@ static void update_one(const char *path, const char *prefix, int prefix_length)
die("Unable to process file %s", path); die("Unable to process file %s", path);
report("add '%s'", path); report("add '%s'", path);
free_return: free_return:
if (p != path) if (p < path || p > path + strlen(path))
free((char*)p); free((char*)p);
} }
@ -609,7 +609,7 @@ static int do_unresolve(int ac, const char **av,
const char *arg = av[i]; const char *arg = av[i];
const char *p = prefix_path(prefix, prefix_length, arg); const char *p = prefix_path(prefix, prefix_length, arg);
err |= unresolve_one(p); err |= unresolve_one(p);
if (p != arg) if (p < arg || p > arg + strlen(arg))
free((char*)p); free((char*)p);
} }
return err; return err;
@ -623,7 +623,7 @@ static int do_reupdate(int ac, const char **av,
*/ */
int pos; int pos;
int has_head = 1; int has_head = 1;
char **pathspec = get_pathspec(prefix, av + 1); const char **pathspec = get_pathspec(prefix, av + 1);
if (read_ref(git_path("HEAD"), head_sha1)) if (read_ref(git_path("HEAD"), head_sha1))
/* If there is no HEAD, that means it is an initial /* If there is no HEAD, that means it is an initial
@ -815,7 +815,7 @@ int main(int argc, const char **argv)
update_one(p, NULL, 0); update_one(p, NULL, 0);
if (set_executable_bit) if (set_executable_bit)
chmod_path(set_executable_bit, p); chmod_path(set_executable_bit, p);
if (p != path_name) if (p < path_name || p > path_name + strlen(path_name))
free((char*) p); free((char*) p);
if (path_name != buf.buf) if (path_name != buf.buf)
free(path_name); free(path_name);