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 f7f5601..a1ada24 100644 (file)
--- a/src/locale/langinfo.c
+++ b/src/locale/langinfo.c
@@ -1,5 +1,7 @@
 #include <locale.h>
 #include <langinfo.h>
+#include "locale_impl.h"
+#include "libc.h"
 
 static const char c_time[] =
        "Sun\0" "Mon\0" "Tue\0" "Wed\0" "Thu\0" "Fri\0" "Sat\0"
@@ -16,15 +18,16 @@ 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" "";
 
-const char *__langinfo(nl_item item)
+char *__nl_langinfo_l(nl_item item, locale_t loc)
 {
        int cat = item >> 16;
        int idx = item & 65535;
@@ -46,7 +49,7 @@ const char *__langinfo(nl_item item)
                str = "";
                break;
        case LC_MESSAGES:
-               if (idx > 1) return NULL;
+               if (idx > 3) return NULL;
                str = c_messages;
                break;
        default:
@@ -54,5 +57,14 @@ const char *__langinfo(nl_item item)
        }
 
        for (; idx; idx--, str++) for (; *str; str++);
-       return str;
+       if (cat != LC_NUMERIC && *str) str = LCTRANS(str, cat, loc);
+       return (char *)str;
+}
+
+char *__nl_langinfo(nl_item item)
+{
+       return __nl_langinfo_l(item, CURRENT_LOCALE);
 }
+
+weak_alias(__nl_langinfo, nl_langinfo);
+weak_alias(__nl_langinfo_l, nl_langinfo_l);