From ea5a709924503bc55767accf13102807faa19da0 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Tue, 3 Sep 2024 14:58:33 -0400 Subject: libio: Attempt wide backup free only for non-legacy code _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 Reviewed-by: Florian Weimer (cherry picked from commit ae4d44b1d501421ad9a3af95279b8f4d1546f1ce) --- NEWS | 2 ++ libio/genops.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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) -- cgit 1.4.1