This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.23/master updated. glibc-2.23-95-g0be74c5
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 31 Mar 2017 08:39:59 -0000
- Subject: GNU C Library master sources branch release/2.23/master updated. glibc-2.23-95-g0be74c5
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, release/2.23/master has been updated
via 0be74c5c7cb239e4884d1ee0fd48c746a0bd1a65 (commit)
from 800f9aa06b64427336eb1f11469d854bf5889122 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0be74c5c7cb239e4884d1ee0fd48c746a0bd1a65
commit 0be74c5c7cb239e4884d1ee0fd48c746a0bd1a65
Author: Slava Barinov <v.barinov@samsung.com>
Date: Fri Mar 31 08:49:25 2017 +0200
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 d4efa41..989e0da 100644
--- 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 b3beeaf..c7ff116 100644
--- 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
Version 2.23
diff --git a/io/fts.h b/io/fts.h
index 127a0d2..b6b4520 100644
--- 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
NEWS | 1 +
io/fts.h | 2 +-
3 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources