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 /iconv/gconv_cache.c | |
| parent | c86b8e7579ac2c4a1f1f70a56715580ed77b4a79 (diff) | |
| download | glibc-0bfddfc9444ed6154da7e70bae6a1b4809b88c93.zip glibc-0bfddfc9444ed6154da7e70bae6a1b4809b88c93.tar.gz glibc-0bfddfc9444ed6154da7e70bae6a1b4809b88c93.tar.bz2 | |
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 'iconv/gconv_cache.c')
| -rw-r--r-- | iconv/gconv_cache.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c index 4db7287..9a456bf 100644 --- a/iconv/gconv_cache.c +++ b/iconv/gconv_cache.c @@ -446,12 +446,9 @@ __gconv_lookup_cache (const char *toset, const char *fromset, void __gconv_release_cache (struct __gconv_step *steps, size_t nsteps) { - /* The only thing we have to deallocate is the record with the - steps. But do not do this if the reference counter is still - positive. This can happen if the steps array was cloned by - __wcsmbs_clone_conv. (The array elements have separate __counter - fields, but they are only out of sync temporarily.) */ - if (gconv_cache != NULL && steps->__counter == 0) + if (gconv_cache != NULL) + /* The only thing we have to deallocate is the record with the + steps. */ free (steps); } |