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

gitster · gitster · commit 3d0449ded882 · 2017-03-16T13:56:42.000-07:00
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
diff --git a/line-log.c b/line-log.c
@@ -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)
 {
 	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;
 }
+
 static void range_set_move(struct range_set *dst, struct range_set *src)
 {
 	range_set_release(dst);

Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,10 @@ void range_set_release(struct range_set *rs)`
`43`	`43`	`static void range_set_copy(struct range_set dst, struct range_set src)`
`44`	`44`	`{`
`45`	`45`	`range_set_init(dst, src->nr);`
`46`		`- memcpy(dst->ranges, src->ranges, src->nr*sizeof(struct range_set));`
	`46`	`+ COPY_ARRAY(dst->ranges, src->ranges, src->nr);`
`47`	`47`	`dst->nr = src->nr;`
`48`	`48`	`}`
	`49`	`+`
`49`	`50`	`static void range_set_move(struct range_set dst, struct range_set src)`
`50`	`51`	`{`
`51`	`52`	`range_set_release(dst);`