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 3a62ca63350856740548501d56e9f59b94b69a93..dfa9537d9019371b2e7eccdad5e146b1b08d3cf7 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-03-20  Mike Frysinger  <vapier@gentoo.org>
 
        [BZ #21275]

diff --git a/NEWS b/NEWS
index 0d5e14e307bc16a6b2a36b801c702e79c0654cb7..71b41ea6255f2c8f12d9531afec94f073c7dee04 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,9 @@ Security related changes:
   question type which is outside the range of valid question type values.
   (CVE-2015-5180)
 
+The following bugs are resolved with this release:
+
+  [21289] Fix symbol redirect for fts_set
 \f
 Version 2.24
 

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