From d4c25e8756d5ef5a43ee90fd9770040cd224204c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 24 Dec 2024 18:35:01 +0100 Subject: [PATCH] setlocale: Fix a buffer overflow check (mistake in yesterday's commit). * lib/setlocale.c (setlocale_unixlike): Update buffer overflow check. --- ChangeLog | 5 +++++ lib/setlocale.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 91e8c5ef98..38b95c2479 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2024-12-24 Bruno Haible + + setlocale: Fix a buffer overflow check (mistake in yesterday's commit). + * lib/setlocale.c (setlocale_unixlike): Update buffer overflow check. + 2024-12-24 Bruno Haible doc: Document mingw with MSVCRT vs. mingw with UCRT. diff --git a/lib/setlocale.c b/lib/setlocale.c index 3cb711d8e1..c239bd1e2c 100644 --- a/lib/setlocale.c +++ b/lib/setlocale.c @@ -818,7 +818,7 @@ setlocale_unixlike (int category, const char *locale) size_t part2_len = strlen (part2) + 1; char buf[64+64+6]; - if (!(part1_len + 1 + part2_len <= sizeof (buf))) + if (!(part1_len + 1 + part2_len + 6 <= sizeof (buf))) abort (); memcpy (buf, part1, part1_len); buf[part1_len] = '_'; -- 2.39.5