about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--elf/cache.c2
-rw-r--r--libio/genops.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 15cda0b84d..30a3eaaf47 100644
--- a/NEWS
+++ b/NEWS
@@ -52,6 +52,7 @@ The following bugs are resolved with this release:
   [20975] Deferred cancellation triggers in __check_pf and looses lock leading to deadlock
   [24816] Fix tst-nss-files-hosts-long on single-stack hosts
   [27576] gmon: improve mcount overflow handling
+  [27821] ungetc: Fix backup buffer leak on program exit
   [28846] CMSG_NXTHDR may trigger -Wstrict-overflow warning
   [29039] Corrupt DTV after reuse of a TLS module ID following dlclose with unused TLS
   [29444] gmon: Fix allocated buffer overflow (bug 29444)
@@ -103,6 +104,8 @@ 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
+  [32231] elf: Change ldconfig auxcache magic number
 
 Version 2.36
 
diff --git a/elf/cache.c b/elf/cache.c
index 3d7d3a67bf..528a8ba694 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -845,7 +845,7 @@ struct aux_cache_entry
   struct aux_cache_entry *next;
 };
 
-#define AUX_CACHEMAGIC		"glibc-ld.so.auxcache-1.0"
+#define AUX_CACHEMAGIC		"glibc-ld.so.auxcache-2.0"
 
 struct aux_cache_file_entry
 {
diff --git a/libio/genops.c b/libio/genops.c
index 36add52faa..1be964ef77 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)