fix undefined behavior in getdelim via null pointer arithmetic and memcpy

[musl] / src / locale / langinfo.c

diff --git a/src/locale/langinfo.c b/src/locale/langinfo.c
index 657dd9c..1477309 100644 (file)
--- a/src/locale/langinfo.c
+++ b/src/locale/langinfo.c
@@ -1,7 +1,6 @@
 #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"
@@ -24,7 +23,7 @@ static const char c_time[] =
        "%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)
@@ -33,30 +32,35 @@ char *__nl_langinfo_l(nl_item item, locale_t loc)
        int idx = item & 65535;
        const char *str;
 
-       if (item == CODESET) return "UTF-8";
+       if (item == CODESET) return loc->cat[LC_CTYPE] ? "UTF-8" : "ASCII";
+
+       /* _NL_LOCALE_NAME extension */
+       if (idx == 65535 && cat < LC_ALL)
+               return loc->cat[cat] ? (char *)loc->cat[cat]->name : "C";
        
        switch (cat) {
        case LC_NUMERIC:
-               if (idx > 1) return NULL;
+               if (idx > 1) return "";
                str = c_numeric;
                break;
        case LC_TIME:
-               if (idx > 0x31) return NULL;
+               if (idx > 0x31) return "";
                str = c_time;
                break;
        case LC_MONETARY:
-               if (idx > 0) return NULL;
+               if (idx > 0) return "";
                str = "";
                break;
        case LC_MESSAGES:
-               if (idx > 1) return NULL;
+               if (idx > 3) return "";
                str = c_messages;
                break;
        default:
-               return NULL;
+               return "";
        }
 
        for (; idx; idx--, str++) for (; *str; str++);
+       if (cat != LC_NUMERIC && *str) str = LCTRANS(str, cat, loc);
        return (char *)str;
 }