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.20/master updated. glibc-2.20-6-g4adf299
- From: allan at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Sep 2014 10:01:48 -0000
- Subject: GNU C Library master sources branch release/2.20/master updated. glibc-2.20-6-g4adf299
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.20/master has been updated
via 4adf2992ac7ebf6720d8d56589eb297f5215730c (commit)
via d2c37d028d48337d00200248340de0e4a893456b (commit)
from 979add9f87577c10c629af82586e48b686672134 (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=4adf2992ac7ebf6720d8d56589eb297f5215730c
commit 4adf2992ac7ebf6720d8d56589eb297f5215730c
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Sep 16 14:20:45 2014 +0530
Fix memory leak in error path of do_ftell_wide (BZ #17370)
(cherry picked from commit 545583d664b64ff234b99aca0d85e99c8a55808f)
diff --git a/ChangeLog b/ChangeLog
index 9ebf81e..890c3c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ [BZ #17370]
+ * libio/wfileops.c (do_ftell_wide): Free OUT on error path.
+
2014-09-11 Tim Lammens <tim.lammens@gmail.com>
[BZ #17370]
diff --git a/libio/wfileops.c b/libio/wfileops.c
index ebc06e8..c5ec5f7 100644
--- a/libio/wfileops.c
+++ b/libio/wfileops.c
@@ -708,7 +708,10 @@ do_ftell_wide (_IO_FILE *fp)
sequences must be complete since they are accepted as
wchar_t; if not, then that is an error. */
if (__glibc_unlikely (status != __codecvt_ok))
- return WEOF;
+ {
+ free (out);
+ return WEOF;
+ }
offset += outstop - out;
free (out);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d2c37d028d48337d00200248340de0e4a893456b
commit d2c37d028d48337d00200248340de0e4a893456b
Author: Tim Lammens <tim.lammens@gmail.com>
Date: Thu Sep 11 10:35:54 2014 +0530
Fix memory leak in libio/wfileops.c do_ftell_wide [BZ #17370]
(cherry picked from commit 984c0ea97f649c869130a1ff099098e2b6f70aad)
Conflicts:
NEWS
diff --git a/ChangeLog b/ChangeLog
index f456c1a..9ebf81e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-11 Tim Lammens <tim.lammens@gmail.com>
+
+ [BZ #17370]
+ * libio/wfileops (do_ftell_wide): Free OUT.
+
2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com>
Jakub Jelinek <jakub@redhat.com>
diff --git a/NEWS b/NEWS
index a9991cc..c555f75 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.20.1
* The following bugs are resolved with this release:
- 17266, 17371.
+ 17266, 17370, 17371.
Version 2.20
diff --git a/libio/wfileops.c b/libio/wfileops.c
index f123add..ebc06e8 100644
--- a/libio/wfileops.c
+++ b/libio/wfileops.c
@@ -711,6 +711,7 @@ do_ftell_wide (_IO_FILE *fp)
return WEOF;
offset += outstop - out;
+ free (out);
}
/* We don't trust _IO_read_end to represent the current file offset
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 10 ++++++++++
NEWS | 2 +-
libio/wfileops.c | 6 +++++-
3 files changed, 16 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources