This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.22-34-ga601b74
- From: ppluzhnikov at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Aug 2015 23:29:33 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-34-ga601b74
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 a601b74d31ca086de38441d316a3dee24c866305 (commit)
from 7565d2a862683a3c26ffb1f32351b8c5ab9f7b31 (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=a601b74d31ca086de38441d316a3dee24c866305
commit a601b74d31ca086de38441d316a3dee24c866305
Author: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Sat Aug 8 16:27:58 2015 -0700
In preparation for fixing BZ#16734, fix failure in misc/tst-error1-mem
when _G_HAVE_MMAP is turned off.
diff --git a/ChangeLog b/ChangeLog
index 64bbb2b..0e7b319 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2015-08-08 Paul Pluzhnikov <ppluzhnikov@google.com>
+ [BZ #16734]
+ * libio/genops.c (_IO_unbuffer_all): Free wide buffer as well.
+
+2015-08-08 Paul Pluzhnikov <ppluzhnikov@google.com>
+
[BZ #17905]
* catgets/Makefile (tst-catgets-mem): New test.
* catgets/catgets.c (catopen): Don't use unbounded alloca.
diff --git a/libio/genops.c b/libio/genops.c
index 0f5e800..e13b3d1 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -977,6 +977,9 @@ _IO_unbuffer_all (void)
_IO_SETBUF (fp, NULL, 0);
+ if (fp->_mode > 0)
+ _IO_wsetb (fp, NULL, NULL, 0);
+
#ifdef _IO_MTSAFE_IO
if (cnt < MAXTRIES && fp->_lock != NULL)
_IO_lock_unlock (*fp->_lock);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
libio/genops.c | 3 +++
2 files changed, 8 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources