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 /libio/Makefile | |
| 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 'libio/Makefile')
| -rw-r--r-- | libio/Makefile | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libio/Makefile b/libio/Makefile index 6e594b8ec5..4a3637f046 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -66,11 +66,7 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \ tst-fwrite-error tst-ftell-partial-wide tst-ftell-active-handler \ tst-ftell-append tst-fputws tst-bz22415 tst-fgetc-after-eof \ tst-sprintf-ub tst-sprintf-chk-ub tst-bz24051 tst-bz24153 \ - tst-wfile-sync tst-wfile-gconv - -# This test tests interaction with the gconv cache. Setting -# GCONV_CACHE during out-of-container testing disables the cache. -tests-container += tst-wfile-ascii + tst-wfile-sync tests-internal = tst-vtables tst-vtables-interposed tst-readline @@ -173,12 +169,10 @@ test-fmemopen-ENV = MALLOC_TRACE=$(objpfx)test-fmemopen.mtrace tst-fopenloc-ENV = MALLOC_TRACE=$(objpfx)tst-fopenloc.mtrace tst-bz22415-ENV = MALLOC_TRACE=$(objpfx)tst-bz22415.mtrace tst-bz24228-ENV = MALLOC_TRACE=$(objpfx)tst-bz24228.mtrace -tst-wfile-gconv-ENV = MALLOC_TRACE=$(objpfx)tst-wfile-gconv.mtrace generated += test-fmemopen.mtrace test-fmemopen.check generated += tst-fopenloc.mtrace tst-fopenloc.check generated += tst-bz22415.mtrace tst-bz22415.check -generated += tst-wfile-gconv.mtrace tst-wfile-gconv.check aux := fileops genops stdfiles stdio strops @@ -194,8 +188,7 @@ shared-only-routines = oldiofopen oldiofdopen oldiofclose oldfileops \ ifeq ($(run-built-tests),yes) tests-special += $(objpfx)test-freopen.out $(objpfx)test-fmemopen-mem.out \ - $(objpfx)tst-bz22415-mem.out \ - $(objpfx)tst-wfile-gconv-mem.out + $(objpfx)tst-bz22415-mem.out ifeq (yes,$(build-shared)) # Run tst-fopenloc-cmp.out and tst-openloc-mem.out only if shared # library is enabled since they depend on tst-fopenloc.out. @@ -229,7 +222,6 @@ $(objpfx)tst-ungetwc2.out: $(gen-locales) $(objpfx)tst-widetext.out: $(gen-locales) $(objpfx)tst_wprintf2.out: $(gen-locales) $(objpfx)tst-wfile-sync.out: $(gen-locales) -$(objpfx)tst-wfile-gconv.out: $(gen-locales) endif $(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen @@ -257,7 +249,3 @@ $(objpfx)tst-bz22415-mem.out: $(objpfx)tst-bz22415.out $(objpfx)tst-bz24228-mem.out: $(objpfx)tst-bz24228.out $(common-objpfx)malloc/mtrace $(objpfx)tst-bz24228.mtrace > $@; \ $(evaluate-test) - -$(objpfx)tst-wfile-gconv-mem.out: $(objpfx)tst-wfile-gconv.out - $(common-objpfx)malloc/mtrace $(objpfx)tst-wfile-gconv.mtrace > $@; \ - $(evaluate-test) |