fts: Fix symbol redirect for fts_set [BZ #21289]

In a 32-bit environment with _FILE_OFFSET_BITS=64, the __REDIRECT macro
combined with __THROW generates an invalid C++ declaration.

(cherry picked from commit ce39613205dc47ceaeea76710d49e7a483b503ab)

diff --git a/ChangeLog b/ChangeLog
index d4efa41002d110af281e233817713982a68812d4..989e0da9ae0fd9bc524df980c48191e7a5d1592d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-31  Slava Barinov  <v.barinov@samsung.com>
+
+       [BZ #21289]
+       * io/fts.h (fts_set): Replace __REDIRECT with __REDIRECT_NTH.
+
 2017-02-02  Siddhesh Poyarekar  <siddhesh@sourceware.org>
 
        * sysdeps/generic/unsecvars.h: Add GLIBC_TUNABLES.

diff --git a/NEWS b/NEWS
index b3beeafe1ca9814abe7193e0a185fd528d5b53e5..c7ff11610e91d6a2cf5052dfd7f9213d6f591609 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,7 @@ The following bugs are resolved with this release:
     (CVE-2016-3075)
   [20177] $dp is not initialized correctly in sysdeps/hppa/start.S
   [20357] Incorrect cos result for 1.5174239687223976
+  [21289] Fix symbol redirect for fts_set
 
 \f
 Version 2.23

diff --git a/io/fts.h b/io/fts.h
index 127a0d27216ba1f43f6feafdaec9c49edd026e64..b6b45206c800436898c1d546fb89ae8824f54d6d 100644 (file)
--- a/io/fts.h
+++ b/io/fts.h
@@ -193,7 +193,7 @@ FTS *__REDIRECT (fts_open, (char * const *, int,
                                int (*)(const FTSENT **, const FTSENT **)),
                     fts64_open);
 FTSENT *__REDIRECT (fts_read, (FTS *), fts64_read);
-int     __REDIRECT (fts_set, (FTS *, FTSENT *, int), fts64_set) __THROW;
+int     __REDIRECT_NTH (fts_set, (FTS *, FTSENT *, int), fts64_set);
 # else
 #  define fts_children fts64_children
 #  define fts_close fts64_close