diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2024-09-03 14:58:33 -0400 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2024-09-11 09:28:15 +0200 |
| commit | ea5a709924503bc55767accf13102807faa19da0 (patch) | |
| tree | 7159a24abd7a13056efe81764387b4ada9fc9ee2 | |
| parent | c21ca2a696c03ff3f3931768a3ada234eebf6337 (diff) | |
| download | glibc-ea5a709924503bc55767accf13102807faa19da0.tar.gz glibc-ea5a709924503bc55767accf13102807faa19da0.tar.xz glibc-ea5a709924503bc55767accf13102807faa19da0.zip | |
libio: Attempt wide backup free only for non-legacy code release/2.34/master
_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)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | libio/genops.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS index 71406cc338..5f1c88d2c5 100644 --- a/NEWS +++ b/NEWS @@ -77,6 +77,7 @@ The following bugs are resolved with this release: [26643] register x8 and quad sized NEON registers are not properly saved when using ld_audit on aarch64 [27576] gmon: improve mcount overflow handling + [27821] ungetc: Fix backup buffer leak on program exit [28036] Incorrect types for pthread_mutexattr_set/getrobust_np [28061] dynamic-link: A failing dlmopen called by an auditor crashed [28062] dynamic-link: Suppress audit calls when a (new) namespace is @@ -169,6 +170,7 @@ The following bugs are resolved with this release: [31476] resolv: Track single-request fallback via _res._flags [31890] resolv: Allow short error responses to match any DNS query [32052] Name space violation in fortify wrappers + [32137] libio: Attempt wide backup free only for non-legacy code Version 2.34 diff --git a/libio/genops.c b/libio/genops.c index b5fc53fd1e..99ef9d0350 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -799,7 +799,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) |