diff options
| author |   Siddhesh Poyarekar <siddhesh@sourceware.org> | 2024-09-03 14:58:33 -0400 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-09-12 00:00:35 +0200 |
| commit | 48794598ee3292822fc92e2b00b7cde2c8c8fc3f (patch) | |
| tree | 9f1b225b5662490559c8393c3f57220510ddb497 | |
| parent | debug: Fix read error handling in pcprofiledump (diff) | |
| download | glibc-48794598ee3292822fc92e2b00b7cde2c8c8fc3f.tar.gz glibc-48794598ee3292822fc92e2b00b7cde2c8c8fc3f.tar.bz2 glibc-48794598ee3292822fc92e2b00b7cde2c8c8fc3f.zip | |
libio: Attempt wide backup free only for non-legacy codegentoo/glibc-2.40-3
_wide_data and _mode are not available in legacy code, so do not attempt
to free the wide backup buffer in legacy code.
Resolves: BZ #32137 and BZ #27821
Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Reviewed-by: Florian Weimer <fweimer@redhat.com>
(cherry picked from commit ae4d44b1d501421ad9a3af95279b8f4d1546f1ce)
(cherry picked from commit 7073164add3b874cf0c19ca0fb84236f6bb0985d)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | libio/genops.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -9,12 +9,14 @@ Version 2.40.1 The following bugs are resolved with this release: + [27821] ungetc: Fix backup buffer leak on program exit [30081] resolv: Do not wait for non-existing second DNS response after error [31717] elf: Avoid re-initializing already allocated TLS in dlopen [31890] resolv: Allow short error responses to match any DNS query [31968] mremap implementation in C does not handle arguments correctly [32026] strerror/strsignal TLS not handled correctly for secondary namespaces [32052] Name space violation in fortify wrappers + [32137] libio: Attempt wide backup free only for non-legacy code Version 2.40 diff --git a/libio/genops.c b/libio/genops.c index 35d8b30710..6f20d49669 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -819,7 +819,7 @@ _IO_unbuffer_all (void) /* Free up the backup area if it was ever allocated. */ if (_IO_have_backup (fp)) _IO_free_backup_area (fp); - if (fp->_mode > 0 && _IO_have_wbackup (fp)) + if (!legacy && fp->_mode > 0 && _IO_have_wbackup (fp)) _IO_free_wbackup_area (fp); if (! (fp->_flags & _IO_UNBUFFERED) |