about summary refs log tree commit diff
path: root/string
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-06-14 09:58:43 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-06-14 10:00:28 -0700
commit49bdf4c19d35c8ae4070699dc0267db3b9a7d79c (patch)
tree613c60ef2119a3984f2aedeb399c3b278653b1d7 /string
parent834f9b8d3cda2cc81084d0913bcefc7683bb9194 (diff)
downloadglibc-49bdf4c19d35c8ae4070699dc0267db3b9a7d79c.tar.gz
glibc-49bdf4c19d35c8ae4070699dc0267db3b9a7d79c.tar.xz
glibc-49bdf4c19d35c8ae4070699dc0267db3b9a7d79c.zip
Use RAX_LP/RDX_LP on SAVE_PTR in x86_64 strtok.S
Diffstat (limited to 'string')
-rw-r--r--string/Makefile2
-rw-r--r--string/tst-strtok_r.c38
2 files changed, 39 insertions, 1 deletions
diff --git a/string/Makefile b/string/Makefile
index 80923a25d2..1628b6adfc 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -56,7 +56,7 @@ tests		:= tester inl-tester noinl-tester testcopy test-ffs	\
 		   tst-strtok tst-strxfrm bug-strcoll1 tst-strfry	\
 		   bug-strtok1 $(addprefix test-,$(strop-tests))	\
 		   bug-envz1 tst-strxfrm2 tst-endian tst-svc2		\
-		   bug-strstr1 bug-strchr1
+		   bug-strstr1 bug-strchr1 tst-strtok_r
 
 
 include ../Rules
diff --git a/string/tst-strtok_r.c b/string/tst-strtok_r.c
new file mode 100644
index 0000000000..5f1cee37f0
--- /dev/null
+++ b/string/tst-strtok_r.c
@@ -0,0 +1,38 @@
+/* Test strtok_r regression for BZ #14229.
+   Copyright (C) 2012 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#define TEST_MAIN
+#define BUF1PAGES 1
+#include "test-string.h"
+
+int
+test_main (void)
+{
+  char line[] = "udf 75868 1 - Live 0xffffffffa0bfb000\n";
+  char **saveptrp;
+  char *tok;
+
+  test_init ();
+
+  /* Check strtok_r won't write beyond the size of (*saveptrp).  */
+  saveptrp = (char **) (buf1 + page_size - sizeof (*saveptrp));
+  tok = strtok_r (line, " \t", saveptrp);
+  return strcmp (tok, "udf") != 0;
+}
+
+#include "../test-skeleton.c"