aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIsaiah Poston <isaiah@ilposton.com>2022-03-12 18:21:56 -0600
committerRich Felker <dalias@aerifal.cx>2022-03-16 19:29:38 -0400
commit6d8a515796270eb6cec8a278cb353a078a10f09a (patch)
tree843dae50fcbe6a1390ed86ef62067ded6b7c48ed /src
parent760f5d7efed4d4761875334f8c4e6398be308cc9 (diff)
downloadmusl-6d8a515796270eb6cec8a278cb353a078a10f09a.tar.gz
musl-6d8a515796270eb6cec8a278cb353a078a10f09a.tar.xz
musl-6d8a515796270eb6cec8a278cb353a078a10f09a.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/locale/duplocale.c5
1 files changed, 5 insertions, 0 deletions
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);