GNU C Library master sources branch master updated. glibc-2.23-413-gcfac4de

[fw at sourceware dot org]

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, master has been updated
       via  cfac4de69cc70fbd6364e58cf77891a7a30f2e09 (commit)
      from  1c1e7fb65828c99d6e0f0f3857089b559a0c8189 (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=cfac4de69cc70fbd6364e58cf77891a7a30f2e09

commit cfac4de69cc70fbd6364e58cf77891a7a30f2e09
Author: Florian Weimer <fweimer@redhat.com>
Date:   Fri Jun 3 09:48:14 2016 +0200

    libio: Use wmemset instead of __wmemset to avoid linknamespace issue
    
    If the wide string operations are pulled into the link, the
    wmemset symbol can cause a linknamespace failure.

diff --git a/ChangeLog b/ChangeLog
index 4e7fd30..94a95f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-03  Florian Weimer  <fweimer@redhat.com>
+
+	* libio/wstrops.c (_IO_wstr_overflow, enlarge_userbuf): Use
+	__wmemset instead of wmemset.
+
 2016-06-02  Carlos O'Donell  <carlos@redhat.com>
 
 	* sysdeps/unix/sysv/linux/bits/in.h [defined _UAPI_LINUX_IN6_H ||
diff --git a/libio/wstrops.c b/libio/wstrops.c
index 2b9d036..8d0e1cb 100644
--- a/libio/wstrops.c
+++ b/libio/wstrops.c
@@ -111,7 +111,7 @@ _IO_wstr_overflow (_IO_FILE *fp, _IO_wint_t c)
 	      fp->_wide_data->_IO_buf_base = NULL;
 	    }
 
-	  wmemset (new_buf + old_wblen, L'\0', new_size - old_wblen);
+	  __wmemset (new_buf + old_wblen, L'\0', new_size - old_wblen);
 
 	  _IO_wsetb (fp, new_buf, new_buf + new_size, 1);
 	  fp->_wide_data->_IO_read_base =
@@ -228,9 +228,9 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
      new position.  */
   assert (offset >= oldend);
   if (reading)
-    wmemset (wd->_IO_read_base + oldend, L'\0', offset - oldend);
+    __wmemset (wd->_IO_read_base + oldend, L'\0', offset - oldend);
   else
-    wmemset (wd->_IO_write_base + oldend, L'\0', offset - oldend);
+    __wmemset (wd->_IO_write_base + oldend, L'\0', offset - oldend);
 
   return 0;
 }

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    5 +++++
 libio/wstrops.c |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources