mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.6.5' into maint

Browse Source 
* maint-1.6.5:
  fix memcpy of overlapping area
This commit is contained in:
Junio C Hamano
2010-01-29 23:36:13 -08:00
parent 63d04a7804 65d41d48a4
commit 3325cea0f7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commit.c
View File

@ -224,7 +224,7 @@ int unregister_shallow(const unsigned char *sha1)
if (pos < 0) if (pos < 0)
return -1; return -1;
if (pos + 1 < commit_graft_nr) if (pos + 1 < commit_graft_nr)
memcpy(commit_graft + pos, commit_graft + pos + 1, memmove(commit_graft + pos, commit_graft + pos + 1,
sizeof(struct commit_graft *) sizeof(struct commit_graft *)
* (commit_graft_nr - pos - 1)); * (commit_graft_nr - pos - 1));
commit_graft_nr--; commit_graft_nr--;