From: Liubov Dmitrieva <ldmitrie@sourceware.org>
Date: Thu, 29 Aug 2013 12:33:47 +0000 (+0400)
Subject: Buffer overrun detected by Intel MPX in wcschr test. Fixed.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36aee6bb45b54f2d242e256b5e596838c18c0b85;p=thirdparty%2Fglibc.git

Buffer overrun detected by Intel MPX in wcschr test. Fixed.
---

diff --git a/string/test-strchr.c b/string/test-strchr.c
index cbcf53ef804..572671f5475 100644
--- a/string/test-strchr.c
+++ b/string/test-strchr.c
@@ -219,9 +219,14 @@ do_random_tests (void)
 static void
 check1 (void)
 {
-  char s[] __attribute__((aligned(16))) = "\xff";
-  char c = '\xfe';
-  char *exp_result = stupid_STRCHR (s, c);
+  CHAR s[] __attribute__((aligned(16))) =
+#ifdef WIDE
+  L"\xff";
+#else
+  "\xff";
+#endif
+  CHAR c = '\xfe';
+  CHAR *exp_result = stupid_STRCHR (s, c);
 
   FOR_EACH_IMPL (impl, 0)
     check_result (impl, s, c, exp_result);