Merge "Fix newlocale with a NULL locale name."

2014-11-05 02:20:55 +00:00
parent 57df00a410 7e0d0f8572
commit c13a2044e3
2 changed files with 16 additions and 6 deletions
--- a/libc/bionic/locale.cpp
+++ b/libc/bionic/locale.cpp
@@ -123,8 +123,8 @@ void freelocale(locale_t l) {
 }

 locale_t newlocale(int category_mask, const char* locale_name, locale_t /*base*/) {
-  // Is 'category_mask' valid?
-  if ((category_mask & ~LC_ALL_MASK) != 0) {
+  // Are 'category_mask' and 'locale_name' valid?
+  if ((category_mask & ~LC_ALL_MASK) != 0 || locale_name == NULL) {
    errno = EINVAL;
    return NULL;
  }