mirrors/git
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
parent aadc81c13b 0cc9e70c4c
commit e04156a437
2 changed files with 6 additions and 6 deletions
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");
p = prefix_path(prefix, prefix_length, arg);
checkout_file(p);
if (p != arg)
if (p < arg || p > arg + strlen(arg))
free((char*)p);
}
@ -300,7 +300,7 @@ int main(int argc, char **argv)
path_name = buf.buf;
p = prefix_path(prefix, prefix_length, path_name);
checkout_file(p);
if (p != path_name)
if (p < path_name || p > path_name + strlen(path_name))
free((char *)p);
if (path_name != buf.buf)
free(path_name);