NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitad520ec

committed

Use memmove() not memcpy() to slide some pointers down.

The previous coding here was formally undefined, though it seems toaccidentally work on most platforms in the buildfarm. Caught by someOpenBSD platforms in which libc contains an assertion check foroverlapping areas passed to memcpy().Thomas Munro

1 parent4c804fb commitad520ecCopy full SHA for ad520ec

File tree

1 file changed

-6

lines changed

src/test/isolation
- isolationtester.c

1 file changed

-6

lines changed

`‎src/test/isolation/isolationtester.c`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -554,8 +554,8 @@ run_permutation(TestSpec testspec, int nsteps, Step *steps)`
`554`	`554`
`555`	`555`	`/* Remove that step from the waiting[] array. */`
`556`	`556`	`if (w+1<nwaiting)`
`557`		`-memcpy(&waiting[w],&waiting[w+1],`
`558`		`-(nwaiting- (w+1))sizeof(Step));`
	`557`	`+memmove(&waiting[w],&waiting[w+1],`
	`558`	`+(nwaiting- (w+1))sizeof(Step));`
`559`	`559`	`nwaiting--;`
`560`	`560`
`561`	`561`	`break;`
`@@ -582,8 +582,8 @@ run_permutation(TestSpec testspec, int nsteps, Step *steps)`
`582`	`582`	`/* This one finished, too! */`
`583`	`583`	`errorstep[nerrorstep++]=waiting[w];`
`584`	`584`	`if (w+1<nwaiting)`
`585`		`-memcpy(&waiting[w],&waiting[w+1],`
`586`		`-(nwaiting- (w+1))sizeof(Step));`
	`585`	`+memmove(&waiting[w],&waiting[w+1],`
	`586`	`+(nwaiting- (w+1))sizeof(Step));`
`587`	`587`	`nwaiting--;`
`588`	`588`	`}`
`589`	`589`	`}`
`@@ -614,8 +614,8 @@ run_permutation(TestSpec testspec, int nsteps, Step *steps)`
`614`	`614`	`{`
`615`	`615`	`errorstep[nerrorstep++]=waiting[w];`
`616`	`616`	`if (w+1<nwaiting)`
`617`		`-memcpy(&waiting[w],&waiting[w+1],`
`618`		`-(nwaiting- (w+1))sizeof(Step));`
	`617`	`+memmove(&waiting[w],&waiting[w+1],`
	`618`	`+(nwaiting- (w+1))sizeof(Step));`
`619`	`619`	`nwaiting--;`
`620`	`620`	`}`
`621`	`621`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitad520ec

File tree

1 file changed

1 file changed

`‎src/test/isolation/isolationtester.c`

0 commit comments