Fix memory leak in error path of do_ftell_wide (BZ #17370)

(cherry picked from commit 545583d664b64ff234b99aca0d85e99c8a55808f)

diff --git a/ChangeLog b/ChangeLog
index 9ebf81e651b64a01ba8d6b5387a0e0320b8a3c94..890c3c64a6906fee5b39285860a35d9450f1a5c2 100644 (file)
--- 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 ebc06e85de33a594c9c426526f7a04730d358e0b..c5ec5f7a278dd08064cbc4162ab758217281f0b7 100644 (file)
--- 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);