Commit8332fe7

committed

Avoid memcpy() with same source and destination address.

The behavior of that is undefined, although unlikely to lead to problems inpractice.Found by running regression tests with Valgrind.

1 parent886c4eb commit8332fe7Copy full SHA for 8332fe7

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,20 +126,19 @@ dispell_lexize(PG_FUNCTION_ARGS)`
`126`	`126`	`if (res==NULL)`
`127`	`127`	`PG_RETURN_POINTER(NULL);`
`128`	`128`
`129`		`-ptr=cptr=res;`
`130`		`-while (ptr->lexeme)`
	`129`	`+cptr=res;`
	`130`	`+for (ptr=cptr;ptr->lexeme;ptr++)`
`131`	`131`	`{`
`132`	`132`	`if (searchstoplist(&(d->stoplist),ptr->lexeme))`
`133`	`133`	`{`
`134`	`134`	`pfree(ptr->lexeme);`
`135`	`135`	`ptr->lexeme=NULL;`
`136`		`-ptr++;`
`137`	`136`	`}`
`138`	`137`	`else`
`139`	`138`	`{`
`140`		`-memcpy(cptr,ptr,sizeof(TSLexeme));`
	`139`	`+if (cptr!=ptr)`
	`140`	`+memcpy(cptr,ptr,sizeof(TSLexeme));`
`141`	`141`	`cptr++;`
`142`		`-ptr++;`
`143`	`142`	`}`
`144`	`143`	`}`
`145`	`144`	`cptr->lexeme=NULL;`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,8 @@ uniqueentry(WordEntryIN a, int l, char buf, int *outbuflen)`
`124`	`124`	`buflen+=res->poslen*sizeof(WordEntryPos)+sizeof(uint16);`
`125`	`125`	`}`
`126`	`126`	`res++;`
`127`		`-memcpy(res,ptr,sizeof(WordEntryIN));`
	`127`	`+if (res!=ptr)`
	`128`	`+memcpy(res,ptr,sizeof(WordEntryIN));`
`128`	`129`	`}`
`129`	`130`	`elseif (ptr->entry.haspos)`
`130`	`131`	`{`

Comments

(0)