diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-07-31 11:43:59 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-07-31 11:43:59 +0200 |
| commit | 0bfddfc9444ed6154da7e70bae6a1b4809b88c93 (patch) | |
| tree | 3b6a738aeebc8f5b4cb0937c0995ce5c8d74e62a /ChangeLog | |
| parent | c86b8e7579ac2c4a1f1f70a56715580ed77b4a79 (diff) | |
| download | glibc-0bfddfc9444ed6154da7e70bae6a1b4809b88c93.tar.gz glibc-0bfddfc9444ed6154da7e70bae6a1b4809b88c93.tar.xz glibc-0bfddfc9444ed6154da7e70bae6a1b4809b88c93.zip | |
iconv: Revert steps array reference counting changes
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 commit 50ce3eae5ba304650459d4441d7d246a7cefc26f, the steps
array is never freed, resulting in an unbounded memory leak.
This reverts commit 50ce3eae5ba304650459d4441d7d246a7cefc26f
("gconv: Check reference count in __gconv_release_cache
[BZ #24677]") and commit 7e740ab2e7be7d83b75513aa406e0b10875f7f9c
("libio: Fix gconv-related memory leak [BZ #24583]"). It
reintroduces bug 24583. (Bug 24677 was just a regression caused by
the second commit.)
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 6b46bfa09d..1d9d50c00c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2019-07-31 Florian Weimer <fweimer@redhat.com> + + [BZ #24583] + [BZ #24677] + iconv, libio: Revert reference counting changes. + * iconv/gconv_cache.c (__gconv_release_cache): Unconditionally + free the steps array. + * libio/Makefile (tests): Remove tst-wfile-gconv. + (tests-container): Do not add tst-wfile-ascii. + (tst-wfile-gconv-ENV): Do not set. + (generated): Do not add tst-wfile-gconv.mtrace, + tst-wfile-gconv.check. + [($run-built-tests)] (tests-special): Do not add + tst-wfile-gconv-mem.out. + (tst-wfile-gconv.out, tst-wfile-gconv-mem.out): Remove targets. + * libio/iofclose.c (_IO_new_fclose): Call __gconv_release_step + instead of __wcsmbs_clone_conv. + * wcsmbs/wcsmbsload.c (__wcsmbs_clone_conv): Remove definition. + * wcsmbs/wcsmbsload.h (__wcsmbs_clone_conv): Remove declaration. + 2019-07-30 Joseph Myers <joseph@codesourcery.com> * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S |