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 f456c1a3c068b4c814b18216b517aebf4bebb275..9ebf81e651b64a01ba8d6b5387a0e0320b8a3c94 100644 (file)
--- 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 a9991cc3de527fef49c4ebc38330ee2ea6cbd06f..c555f7591c8bb03ef2577cfa1717bf5e39757659 100644 (file)
--- 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.
 \f
 Version 2.20
 

diff --git a/libio/wfileops.c b/libio/wfileops.c
index f123add354f5326a47e9aec66412e879047f7d61..ebc06e85de33a594c9c426526f7a04730d358e0b 100644 (file)
--- 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