avoid reading uninitialized memory in __map_file

[musl] / src / locale / langinfo.c

diff --git a/src/locale/langinfo.c b/src/locale/langinfo.c
index 13abf45..a1ada24 100644 (file)
--- a/src/locale/langinfo.c
+++ b/src/locale/langinfo.c
@@ -18,12 +18,13 @@ static const char c_time[] =
        "%H:%M:%S\0"
        "%I:%M:%S %p\0"
        "\0"
+       "\0"
        "%m/%d/%y\0"
-       "0123456789"
+       "0123456789\0"
        "%a %b %e %T %Y\0"
        "%H:%M:%S";
 
-static const char c_messages[] = "^[yY]\0" "^[nN]";
+static const char c_messages[] = "^[yY]\0" "^[nN]\0" "yes\0" "no";
 static const char c_numeric[] = ".\0" "";
 
 char *__nl_langinfo_l(nl_item item, locale_t loc)
@@ -48,7 +49,7 @@ char *__nl_langinfo_l(nl_item item, locale_t loc)
                str = "";
                break;
        case LC_MESSAGES:
-               if (idx > 1) return NULL;
+               if (idx > 3) return NULL;
                str = c_messages;
                break;
        default:
@@ -56,6 +57,7 @@ char *__nl_langinfo_l(nl_item item, locale_t loc)
        }
 
        for (; idx; idx--, str++) for (; *str; str++);
+       if (cat != LC_NUMERIC && *str) str = LCTRANS(str, cat, loc);
        return (char *)str;
 }