diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index 8517010e5e..23ee8f1dad 100644
--- 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
index b832deb22e..902ee22fe5 100644
--- 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);
 	}