Index: head/lib/libc/tests/string/wcsnlen_test.c
===================================================================
--- head/lib/libc/tests/string/wcsnlen_test.c	(revision 350159)
+++ head/lib/libc/tests/string/wcsnlen_test.c	(revision 350160)
@@ -1,104 +1,104 @@
 /*-
  * Copyright (c) 2009 David Schultz <das@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
 
 #include <atf-c.h>
 
 static void *
 makebuf(size_t len, int guard_at_end)
 {
 	char *buf;
 	size_t alloc_size = roundup2(len, PAGE_SIZE) + PAGE_SIZE;
 
 	buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
 	ATF_CHECK(buf);
 	if (guard_at_end) {
 		ATF_CHECK(munmap(buf + alloc_size - PAGE_SIZE, PAGE_SIZE) == 0);
 		return (buf + alloc_size - PAGE_SIZE - len);
 	} else {
 		ATF_CHECK(munmap(buf, PAGE_SIZE) == 0);
 		return (buf + PAGE_SIZE);
 	}
 }
 
 static void
 test_wcsnlen(const wchar_t *s)
 {
 	wchar_t *s1;
 	size_t size, len, bufsize;
 	int i;
 
 	size = wcslen(s) + 1;
 	for (i = 0; i <= 1; i++) {
 		for (bufsize = 0; bufsize <= size + 10; bufsize++) {
 			s1 = makebuf(bufsize * sizeof(wchar_t), i);
-			wmemcpy(s1, s, bufsize);
+			wmemcpy(s1, s, bufsize <= size ? bufsize : size);
 			len = (size > bufsize) ? bufsize : size - 1;
 			ATF_CHECK(wcsnlen(s1, bufsize) == len);
 		}
 	}
 }
 
 ATF_TC_WITHOUT_HEAD(nul);
 ATF_TC_BODY(nul, tc)
 {
 
 	test_wcsnlen(L"");
 }
 
 ATF_TC_WITHOUT_HEAD(foo);
 ATF_TC_BODY(foo, tc)
 {
 
 	test_wcsnlen(L"foo");
 }
 
 ATF_TC_WITHOUT_HEAD(glorp);
 ATF_TC_BODY(glorp, tc)
 {
 
 	test_wcsnlen(L"glorp");
 }
 
 ATF_TP_ADD_TCS(tp)
 {
 
 	ATF_TP_ADD_TC(tp, nul);
 	ATF_TP_ADD_TC(tp, foo);
 	ATF_TP_ADD_TC(tp, glorp);
 
 	return (atf_no_error());
 }