Use memcpy() instead of strncpy() for copying into varlena structures.

petere · petere · commit f11aa82d0378 · 2007-02-07T00:32:15.000Z
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
@@ -779,7 +779,7 @@ querytree(PG_FUNCTION_ARGS)
 
 		res = (text *) palloc(nrm.cur - nrm.buf + VARHDRSZ);
 		VARATT_SIZEP(res) = nrm.cur - nrm.buf + VARHDRSZ;
-		strncpy(VARDATA(res), nrm.buf, nrm.cur - nrm.buf);
+		memcpy(VARDATA(res), nrm.buf, nrm.cur - nrm.buf);
 	}
 	pfree(q);
 
diff --git a/contrib/tsearch2/query.c b/contrib/tsearch2/query.c
@@ -928,7 +928,7 @@ tsquerytree(PG_FUNCTION_ARGS)
 
 		res = (text *) palloc(nrm.cur - nrm.buf + VARHDRSZ);
 		VARATT_SIZEP(res) = nrm.cur - nrm.buf + VARHDRSZ;
-		strncpy(VARDATA(res), nrm.buf, nrm.cur - nrm.buf);
+		memcpy(VARDATA(res), nrm.buf, nrm.cur - nrm.buf);
 		pfree(q);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,7 @@ querytree(PG_FUNCTION_ARGS)`
`779`	`779`
`780`	`780`	`res = (text *) palloc(nrm.cur - nrm.buf + VARHDRSZ);`
`781`	`781`	`VARATT_SIZEP(res) = nrm.cur - nrm.buf + VARHDRSZ;`
`782`		`- strncpy(VARDATA(res), nrm.buf, nrm.cur - nrm.buf);`
	`782`	`+ memcpy(VARDATA(res), nrm.buf, nrm.cur - nrm.buf);`
`783`	`783`	`}`
`784`	`784`	`pfree(q);`
`785`	`785`
Original file line number	Diff line number	Diff line change
`@@ -928,7 +928,7 @@ tsquerytree(PG_FUNCTION_ARGS)`
`928`	`928`
`929`	`929`	`res = (text *) palloc(nrm.cur - nrm.buf + VARHDRSZ);`
`930`	`930`	`VARATT_SIZEP(res) = nrm.cur - nrm.buf + VARHDRSZ;`
`931`		`- strncpy(VARDATA(res), nrm.buf, nrm.cur - nrm.buf);`
	`931`	`+ memcpy(VARDATA(res), nrm.buf, nrm.cur - nrm.buf);`
`932`	`932`	`pfree(q);`
`933`	`933`	`}`
`934`	`934`