>From 4ca9e890bd8bca4e1b8d2690f4a383644affacfd Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 23 Sep 2026 19:38:14 -0400 Subject: [PATCH 23/23] remove always-true conditional from __get_locale success path the !map case is now handled above when checking if errno admits path search continuation. --- src/locale/locale_map.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/locale/locale_map.c b/src/locale/locale_map.c index b08c3bce..f97acb0e 100644 --- a/src/locale/locale_map.c +++ b/src/locale/locale_map.c @@ -112,20 +112,18 @@ const struct __locale_map *__get_locale(int cat, const char *val) } break; } - if (map) { - struct __locale_map tmp; - if (load_locale(&tmp, map) || - !(new = malloc(sizeof *new))) { - __munmap((void *)map, map_size); - break; - } - *new = tmp; - memcpy(new->name, val, n); - new->name[n] = 0; - new->next = loc_head; - loc_head = new; + struct __locale_map tmp; + if (load_locale(&tmp, map) || + !(new = malloc(sizeof *new))) { + __munmap((void *)map, map_size); break; } + *new = tmp; + memcpy(new->name, val, n); + new->name[n] = 0; + new->next = loc_head; + loc_head = new; + break; } if (new) return new; -- 2.21.0