Skip to content

Commit

Permalink
In preparation for fixing BZ#16734, fix failure in misc/tst-error1-mem
Browse files Browse the repository at this point in the history
when _G_HAVE_MMAP is turned off.
  • Loading branch information
Paul Pluzhnikov committed Aug 8, 2015
1 parent 7565d2a commit a601b74
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
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]
Expand Down
3 changes: 3 additions & 0 deletions libio/genops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit a601b74

Please sign in to comment.