From 8e858b1bb35cee5d228c38aa4e0a0704f3853dec Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 15 Sep 2018 12:04:03 +0200 Subject: [PATCH] strstr, strcasestr: Add workaround against glibc-2.28 bug. Reported by Michael Brunnbauer via Siddhesh Poyarekar and Eric Blake. * m4/strstr.m4 (gl_FUNC_STRSTR_SIMPLE): Set gl_cv_func_strstr_works_always to 'no' on glibc 2.28. * m4/strcasestr.m4 (gl_FUNC_STRCASESTR_SIMPLE): Set gl_cv_func_strcasestr_works_always to 'no' on glibc 2.28. * doc/posix-functions/strstr.texi: Document the glibc 2.28 bug. * doc/glibc-functions/strcasestr.texi: Likewise. --- ChangeLog | 11 +++++++ doc/glibc-functions/strcasestr.texi | 5 ++-- doc/posix-functions/strstr.texi | 3 ++ m4/strcasestr.m4 | 45 +++++++++++++++++------------ m4/strstr.m4 | 45 +++++++++++++++++------------ 5 files changed, 71 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35cc272257..79516723b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2018-09-15 Bruno Haible + + strstr, strcasestr: Add workaround against glibc-2.28 bug. + Reported by Michael Brunnbauer via Siddhesh Poyarekar and Eric Blake. + * m4/strstr.m4 (gl_FUNC_STRSTR_SIMPLE): Set + gl_cv_func_strstr_works_always to 'no' on glibc 2.28. + * m4/strcasestr.m4 (gl_FUNC_STRCASESTR_SIMPLE): Set + gl_cv_func_strcasestr_works_always to 'no' on glibc 2.28. + * doc/posix-functions/strstr.texi: Document the glibc 2.28 bug. + * doc/glibc-functions/strcasestr.texi: Likewise. + 2018-09-14 Bruno Haible doc: Fix bottom of top-level page. diff --git a/doc/glibc-functions/strcasestr.texi b/doc/glibc-functions/strcasestr.texi index f87ae1f4fc..7f38de921b 100644 --- a/doc/glibc-functions/strcasestr.texi +++ b/doc/glibc-functions/strcasestr.texi @@ -11,15 +11,16 @@ or @code{strcasestr}: This function is missing on some platforms: AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x, mingw, MSVC 14, BeOS. - @item This function can trigger memchr bugs on some platforms: glibc 2.10. - @item This function can trigger false positives for long periodic needles on some platforms: glibc 2.12, Cygwin 1.7.7. +@item +This function may fail to find matches on some platforms: +glibc 2.28. @end itemize Portability problems fixed by Gnulib module @code{strcasestr}: diff --git a/doc/posix-functions/strstr.texi b/doc/posix-functions/strstr.texi index 0863673788..ca22660163 100644 --- a/doc/posix-functions/strstr.texi +++ b/doc/posix-functions/strstr.texi @@ -16,6 +16,9 @@ glibc 2.10. This function can trigger false positives for long periodic needles on some platforms: glibc 2.12, Cygwin 1.7.7. +@item +This function may fail to find matches on some platforms: +glibc 2.28. @end itemize Portability problems fixed by Gnulib @code{strstr}: diff --git a/m4/strcasestr.m4 b/m4/strcasestr.m4 index 974aee2dcb..c57ac4f79c 100644 --- a/m4/strcasestr.m4 +++ b/m4/strcasestr.m4 @@ -1,4 +1,4 @@ -# strcasestr.m4 serial 23 +# strcasestr.m4 serial 24 dnl Copyright (C) 2005, 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -20,25 +20,34 @@ AC_DEFUN([gl_FUNC_STRCASESTR_SIMPLE], if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then REPLACE_STRCASESTR=1 else - dnl Detect https://sourceware.org/bugzilla/show_bug.cgi?id=12092. + dnl Detect https://sourceware.org/bugzilla/show_bug.cgi?id=12092 + dnl and https://sourceware.org/bugzilla/show_bug.cgi?id=23637. AC_CACHE_CHECK([whether strcasestr works], [gl_cv_func_strcasestr_works_always], - [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ #include /* for strcasestr */ +#ifdef __GNU_LIBRARY__ + #include + #if __GLIBC__ == 2 && __GLIBC_MINOR__ == 28 + Unlucky user + #endif +#endif #define P "_EF_BF_BD" #define HAYSTACK "F_BD_CE_BD" P P P P "_C3_88_20" P P P "_C3_A7_20" P #define NEEDLE P P P P P -]], [[return !!strcasestr (HAYSTACK, NEEDLE); - ]])], - [gl_cv_func_strcasestr_works_always=yes], - [gl_cv_func_strcasestr_works_always=no], - [dnl glibc 2.12 and cygwin 1.7.7 have a known bug. uClibc is not - dnl affected, since it uses different source code for strcasestr - dnl than glibc. - dnl Assume that it works on all other platforms, even if it is not - dnl linear. - AC_EGREP_CPP([Lucky user], - [ +]], + [[return !!strcasestr (HAYSTACK, NEEDLE); + ]])], + [gl_cv_func_strcasestr_works_always=yes], + [gl_cv_func_strcasestr_works_always=no], + [dnl glibc 2.12 and cygwin 1.7.7 have a known bug. uClibc is not + dnl affected, since it uses different source code for strcasestr + dnl than glibc. + dnl Assume that it works on all other platforms, even if it is not + dnl linear. + AC_EGREP_CPP([Lucky user], + [ #ifdef __GNU_LIBRARY__ #include #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \ @@ -53,10 +62,10 @@ AC_DEFUN([gl_FUNC_STRCASESTR_SIMPLE], #else Lucky user #endif - ], - [gl_cv_func_strcasestr_works_always="guessing yes"], - [gl_cv_func_strcasestr_works_always="guessing no"]) - ]) + ], + [gl_cv_func_strcasestr_works_always="guessing yes"], + [gl_cv_func_strcasestr_works_always="guessing no"]) + ]) ]) case "$gl_cv_func_strcasestr_works_always" in *yes) ;; diff --git a/m4/strstr.m4 b/m4/strstr.m4 index aa590a97b6..40dbeacbb9 100644 --- a/m4/strstr.m4 +++ b/m4/strstr.m4 @@ -1,4 +1,4 @@ -# strstr.m4 serial 19 +# strstr.m4 serial 20 dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,25 +12,34 @@ AC_DEFUN([gl_FUNC_STRSTR_SIMPLE], if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then REPLACE_STRSTR=1 else - dnl Detect https://sourceware.org/bugzilla/show_bug.cgi?id=12092. + dnl Detect https://sourceware.org/bugzilla/show_bug.cgi?id=12092 + dnl and https://sourceware.org/bugzilla/show_bug.cgi?id=23637. AC_CACHE_CHECK([whether strstr works], [gl_cv_func_strstr_works_always], - [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ #include /* for strstr */ +#ifdef __GNU_LIBRARY__ + #include + #if __GLIBC__ == 2 && __GLIBC_MINOR__ == 28 + Unlucky user + #endif +#endif #define P "_EF_BF_BD" #define HAYSTACK "F_BD_CE_BD" P P P P "_C3_88_20" P P P "_C3_A7_20" P #define NEEDLE P P P P P -]], [[return !!strstr (HAYSTACK, NEEDLE); - ]])], - [gl_cv_func_strstr_works_always=yes], - [gl_cv_func_strstr_works_always=no], - [dnl glibc 2.12 and cygwin 1.7.7 have a known bug. uClibc is not - dnl affected, since it uses different source code for strstr than - dnl glibc. - dnl Assume that it works on all other platforms, even if it is not - dnl linear. - AC_EGREP_CPP([Lucky user], - [ +]], + [[return !!strstr (HAYSTACK, NEEDLE); + ]])], + [gl_cv_func_strstr_works_always=yes], + [gl_cv_func_strstr_works_always=no], + [dnl glibc 2.12 and cygwin 1.7.7 have a known bug. uClibc is not + dnl affected, since it uses different source code for strstr than + dnl glibc. + dnl Assume that it works on all other platforms, even if it is not + dnl linear. + AC_EGREP_CPP([Lucky user], + [ #ifdef __GNU_LIBRARY__ #include #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \ @@ -45,10 +54,10 @@ AC_DEFUN([gl_FUNC_STRSTR_SIMPLE], #else Lucky user #endif - ], - [gl_cv_func_strstr_works_always="guessing yes"], - [gl_cv_func_strstr_works_always="guessing no"]) - ]) + ], + [gl_cv_func_strstr_works_always="guessing yes"], + [gl_cv_func_strstr_works_always="guessing no"]) + ]) ]) case "$gl_cv_func_strstr_works_always" in *yes) ;; -- 2.39.5