diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | doc/posix-functions/strtok_r.texi | 4 | ||||
| -rw-r--r-- | lib/string.in.h | 8 | ||||
| -rw-r--r-- | lib/strtok_r.c | 10 | ||||
| -rw-r--r-- | m4/string_h.m4 | 4 | ||||
| -rw-r--r-- | m4/strtok_r.m4 | 52 | ||||
| -rw-r--r-- | modules/string | 2 |
7 files changed, 85 insertions, 9 deletions
@@ -1,3 +1,17 @@ +2009-09-06 Ben Pfaff <blp@gnu.org> + Bruno Haible <bruno@clisp.org> + + Work around a glibc bug in strtok_r. + * lib/string.in.h (strtok_r): Replace if REPLACE_STRTOK_R is set. + Undefine if UNDEFINE_STRTOK_R is set. + * lib/strtok_r.c (strtok_r, __strtok_r) [!_LIBC]: Don't undefine. + * m4/string_h.m4 (gl_HEADER_STRING_H_DEFAULTS): Initialize + REPLACE_STRTOK_R and UNDEFINE_STRTOK_R. + * m4/strtok_r.m4 (gl_FUNC_STRTOK_R): Check against the glibc bug. + * modules/string (Makefile.am): Substitute REPLACE_STRTOK_R, + UNDEFINE_STRTOK_R. + * doc/posix-functions/strtok_r.texi: Mention the glibc 2.7 bug. + 2009-09-06 Sergey Poznyakoff <gray@gnu.org.ua> exclude: minor fix diff --git a/doc/posix-functions/strtok_r.texi b/doc/posix-functions/strtok_r.texi index 7c0901ed0f..2490572ca0 100644 --- a/doc/posix-functions/strtok_r.texi +++ b/doc/posix-functions/strtok_r.texi @@ -11,6 +11,10 @@ Portability problems fixed by Gnulib: @item This function is missing on some platforms: mingw. +@item +This function crashes when invoked from code compiled with optimization enabled +on some platforms: +glibc 2.7. @end itemize Portability problems not fixed by Gnulib: diff --git a/lib/string.in.h b/lib/string.in.h index 8eaeeb8824..89c23c7f4a 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -399,7 +399,13 @@ extern char *strcasestr (const char *haystack, const char *needle) See also strsep(). */ #if @GNULIB_STRTOK_R@ -# if ! @HAVE_DECL_STRTOK_R@ +# if @REPLACE_STRTOK_R@ +# undef strtok_r +# define strtok_r rpl_strtok_r +# elif @UNDEFINE_STRTOK_R@ +# undef strtok_r +# endif +# if ! @HAVE_DECL_STRTOK_R@ || @REPLACE_STRTOK_R@ extern char *strtok_r (char *restrict s, char const *restrict delim, char **restrict save_ptr); # endif diff --git a/lib/strtok_r.c b/lib/strtok_r.c index 232474a7be..f7e0e63e51 100644 --- a/lib/strtok_r.c +++ b/lib/strtok_r.c @@ -1,5 +1,5 @@ /* Reentrant string tokenizer. Generic version. - Copyright (C) 1991,1996-1999,2001,2004,2007 Free Software Foundation, Inc. + Copyright (C) 1991,1996-1999,2001,2004,2007,2009 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -21,10 +21,10 @@ #include <string.h> -#undef strtok_r -#undef __strtok_r - -#ifndef _LIBC +#ifdef _LIBC +# undef strtok_r +# undef __strtok_r +#else # define __strtok_r strtok_r # define __rawmemchr strchr #endif diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 11f09c8b8f..3dbbfe166e 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -5,7 +5,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # Written by Paul Eggert. @@ -91,4 +91,6 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], REPLACE_STRCASESTR=0; AC_SUBST([REPLACE_STRCASESTR]) REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR]) REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL]) + REPLACE_STRTOK_R=0; AC_SUBST([REPLACE_STRTOK_R]) + UNDEFINE_STRTOK_R=0; AC_SUBST([UNDEFINE_STRTOK_R]) ]) diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4 index b79c2eeee1..fd52317144 100644 --- a/m4/strtok_r.m4 +++ b/m4/strtok_r.m4 @@ -1,4 +1,4 @@ -# strtok_r.m4 serial 8 +# strtok_r.m4 serial 9 dnl Copyright (C) 2002, 2003, 2004, 2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,7 +10,55 @@ AC_DEFUN([gl_FUNC_STRTOK_R], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS([strtok_r]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CHECK_FUNCS([strtok_r]) + if test $ac_cv_func_strtok_r = yes; then + dnl glibc 2.7 has a bug in strtok_r that causes a segmentation fault + dnl when the second argument to strtok_r is a constant string that has + dnl exactly one byte and compiling with optimization. This bug is, for + dnl example, present in the glibc 2.7-18 package in Debian "lenny". + dnl See <http://sources.redhat.com/bugzilla/show_bug.cgi?id=5614>. + AC_CACHE_CHECK([whether strtok_r works], [gl_cv_func_strtok_r_works], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ + #ifndef __OPTIMIZE__ + # define __OPTIMIZE__ 1 + #endif + #undef __OPTIMIZE_SIZE__ + #undef __NO_INLINE__ + #include <stdio.h> + #include <string.h> + ]], + [[char delimiters[] = "xxxxxxxx"; + char *save_ptr = (char *) 0xd0d0; + strtok_r (delimiters, "x", &save_ptr); + strtok_r (NULL, "x", &save_ptr); + return 0; + ]]) + ], + [gl_cv_func_strtok_r_works=yes], + [gl_cv_func_strtok_r_works=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess no on glibc systems. + *-gnu*) gl_cv_func_strtok_r_works="guessing no";; + *) gl_cv_func_strtok_r_works="guessing yes";; + esac +changequote([,])dnl + ]) + ]) + case "$gl_cv_func_strtok_r_works" in + *no) + dnl We could set REPLACE_STRTOK_R=1 and AC_LIBOBJ([strtok_r]) here, + dnl but it's only the macro version in <bits/string2.h> which is wrong. + dnl The code compiled into libc is fine. + UNDEFINE_STRTOK_R=1 + ;; + esac + else + AC_LIBOBJ([strtok_r]) + fi AC_CHECK_DECLS_ONCE([strtok_r]) if test $ac_cv_have_decl_strtok_r = no; then HAVE_DECL_STRTOK_R=0 diff --git a/modules/string b/modules/string index 40731467d6..9bafa7e904 100644 --- a/modules/string +++ b/modules/string @@ -83,6 +83,8 @@ string.h: string.in.h -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ + -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ + -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/string.in.h; \ } > $@-t && \ |