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

Merge branch 'vn/line-log-memcpy-size-fix'

Browse Source 
The command-line parsing of "git log -L" copied internal data
structures using incorrect size on ILP32 systems.

* vn/line-log-memcpy-size-fix:
  line-log: use COPY_ARRAY to fix mis-sized memcpy
This commit is contained in:
Junio C Hamano
2017-03-12 23:21:35 -07:00
parent cb36508ac5 07f546cda5
commit 6c621015f2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
line-log.c
View File

@ -43,9 +43,10 @@ void range_set_release(struct range_set *rs)
static void range_set_copy(struct range_set *dst, struct range_set *src) static void range_set_copy(struct range_set *dst, struct range_set *src)
{ {
range_set_init(dst, src->nr); range_set_init(dst, src->nr);
memcpy(dst->ranges, src->ranges, src->nr*sizeof(struct range_set)); COPY_ARRAY(dst->ranges, src->ranges, src->nr);
dst->nr = src->nr; dst->nr = src->nr;
} }
static void range_set_move(struct range_set *dst, struct range_set *src) static void range_set_move(struct range_set *dst, struct range_set *src)
{ {
range_set_release(dst); range_set_release(dst);