From 6d8a515796270eb6cec8a278cb353a078a10f09a Mon Sep 17 00:00:00 2001
From: Isaiah Poston <isaiah@ilposton.com>
Date: Sat, 12 Mar 2022 18:21:56 -0600
Subject: fix invalid free of duplocale object when malloc has been replaced
newlocale and freelocale use __libc_malloc and __libc_free, but
duplocale used malloc. If malloc was replaced, this resulted in
invalid free using the wrong allocator when passing the result of
duplocale to freelocale.
Instead, use libc-internal malloc for duplocale.
This bug was introduced by commit
1e4204d522670a1d8b8ab85f1cfefa960547e8af.
---
src/locale/duplocale.c | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'src')
diff --git a/src/locale/duplocale.c b/src/locale/duplocale.c
index 030b64cb..5ce33ae6 100644
--- a/src/locale/duplocale.c
+++ b/src/locale/duplocale.c
@@ -3,6 +3,11 @@
#include "locale_impl.h"
#include "libc.h"
+#define malloc __libc_malloc
+#define calloc undef
+#define realloc undef
+#define free undef
+
locale_t __duplocale(locale_t old)
{
locale_t new = malloc(sizeof *new);
--
cgit v1.2.3-70-g09d2