mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
0bfddfc944
The changes introduce a memory leak for gconv steps arrays whose first element is an internal conversion, which has a fixed reference count which is not decremented. As a result, after the change in commit50ce3eae5b, the steps array is never freed, resulting in an unbounded memory leak. This reverts commit50ce3eae5b("gconv: Check reference count in __gconv_release_cache [BZ #24677]") and commit7e740ab2e7("libio: Fix gconv-related memory leak [BZ #24583]"). It reintroduces bug 24583. (Bug 24677 was just a regression caused by the second commit.)
81 lines
2.6 KiB
C
81 lines
2.6 KiB
C
/* Copyright (C) 1993-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>.
|
|
|
|
As a special exception, if you link the code in this file with
|
|
files compiled with a GNU compiler to produce an executable,
|
|
that does not cause the resulting executable to be covered by
|
|
the GNU Lesser General Public License. This exception does not
|
|
however invalidate any other reasons why the executable file
|
|
might be covered by the GNU Lesser General Public License.
|
|
This exception applies to code released by its copyright holders
|
|
in files containing the exception. */
|
|
|
|
#include "libioP.h"
|
|
#include <stdlib.h>
|
|
#include "../iconv/gconv_int.h"
|
|
#include <shlib-compat.h>
|
|
|
|
int
|
|
_IO_new_fclose (FILE *fp)
|
|
{
|
|
int status;
|
|
|
|
CHECK_FILE(fp, EOF);
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
|
|
/* We desperately try to help programs which are using streams in a
|
|
strange way and mix old and new functions. Detect old streams
|
|
here. */
|
|
if (_IO_vtable_offset (fp) != 0)
|
|
return _IO_old_fclose (fp);
|
|
#endif
|
|
|
|
/* First unlink the stream. */
|
|
if (fp->_flags & _IO_IS_FILEBUF)
|
|
_IO_un_link ((struct _IO_FILE_plus *) fp);
|
|
|
|
_IO_acquire_lock (fp);
|
|
if (fp->_flags & _IO_IS_FILEBUF)
|
|
status = _IO_file_close_it (fp);
|
|
else
|
|
status = fp->_flags & _IO_ERR_SEEN ? -1 : 0;
|
|
_IO_release_lock (fp);
|
|
_IO_FINISH (fp);
|
|
if (fp->_mode > 0)
|
|
{
|
|
/* This stream has a wide orientation. This means we have to free
|
|
the conversion functions. */
|
|
struct _IO_codecvt *cc = fp->_codecvt;
|
|
|
|
__libc_lock_lock (__gconv_lock);
|
|
__gconv_release_step (cc->__cd_in.__cd.__steps);
|
|
__gconv_release_step (cc->__cd_out.__cd.__steps);
|
|
__libc_lock_unlock (__gconv_lock);
|
|
}
|
|
else
|
|
{
|
|
if (_IO_have_backup (fp))
|
|
_IO_free_backup_area (fp);
|
|
}
|
|
_IO_deallocate_file (fp);
|
|
return status;
|
|
}
|
|
|
|
versioned_symbol (libc, _IO_new_fclose, _IO_fclose, GLIBC_2_1);
|
|
strong_alias (_IO_new_fclose, __new_fclose)
|
|
versioned_symbol (libc, __new_fclose, fclose, GLIBC_2_1);
|