From: Siddhesh Poyarekar Date: Tue, 3 Sep 2024 18:58:33 +0000 (-0400) Subject: libio: Attempt wide backup free only for non-legacy code X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0141e7c794afc0404d3bf6fd0771a324ccb8a81c;p=thirdparty%2Fglibc.git 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) --- diff --git a/NEWS b/NEWS index 3304e3870f..8431eb0d51 100644 --- a/NEWS +++ b/NEWS @@ -45,6 +45,7 @@ The following bugs are resolved with this release: [20975] Deferred cancellation triggers in __check_pf and looses lock leading to deadlock [27576] gmon: improve mcount overflow handling + [27821] ungetc: Fix backup buffer leak on program exit [29039] Corrupt DTV after reuse of a TLS module ID following dlclose with unused TLS [29444] gmon: Fix allocated buffer overflow (bug 29444) [30053] time: strftime %s returns -1 after 2038 on 32 bits systems @@ -69,6 +70,7 @@ The following bugs are resolved with this release: [31965] rseq extension mechanism does not work as intended [31968] mremap implementation in C does not handle arguments correctly [32052] Name space violation in fortify wrappers + [32137] libio: Attempt wide backup free only for non-legacy code Version 2.37 diff --git a/libio/genops.c b/libio/genops.c index 5530ebc403..5e1caaf011 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)