ICU-22609 Fix nulldef w/ bogus locale in DateFormat::creaet*

unicode-org · Dec 15, 2023 · 3057c8e · 3057c8e
1 parent 5cf5ec1
commit 3057c8e
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 2 deletions.
diff --git a/icu4c/source/i18n/datefmt.cpp b/icu4c/source/i18n/datefmt.cpp
@@ -519,9 +519,15 @@ DateFormat::createInstanceForSkeleton(
 //----------------------------------------------------------------------
 
 DateFormat* U_EXPORT2
-DateFormat::create(EStyle timeStyle, EStyle dateStyle, const Locale& locale)
+DateFormat::create(EStyle timeStyle, EStyle dateStyle, const Locale& inLocale)
 {
     UErrorCode status = U_ZERO_ERROR;
+    Locale locale(inLocale);
+    // If the locale is bogus, fallback to use default locale first.
+    if (locale.isBogus()) {
+        locale = Locale::getDefault();
+    }
+
 #if U_PLATFORM_USES_ONLY_WIN32_API
     char buffer[8];
     int32_t count = locale.getKeywordValue("compat", buffer, sizeof(buffer), status);

diff --git a/icu4c/source/i18n/smpdtfmt.cpp b/icu4c/source/i18n/smpdtfmt.cpp
@@ -663,6 +663,10 @@ void SimpleDateFormat::construct(EStyle timeStyle,
 {
     // called by several constructors to load pattern data from the resources
     if (U_FAILURE(status)) return;
+    if (locale.isBogus()) {
+        status = U_ILLEGAL_ARGUMENT_ERROR;
+        return;
+    }
 
     // We will need the calendar to know what type of symbols to load.
     initializeCalendar(nullptr, locale, status);
@@ -728,7 +732,6 @@ void SimpleDateFormat::construct(EStyle timeStyle,
         if (locale.getKeywordValue("rg", nullptr, 0, dummyErr1) > 0 || locale.getKeywordValue("hours", nullptr, 0, dummyErr2) > 0) {
             hasRgOrHcSubtag = true;
         }
-
         const char* baseLocID = locale.getBaseName();
         if (baseLocID[0]!=0 && uprv_strcmp(baseLocID,"und")!=0) {
             UErrorCode useStatus = U_ZERO_ERROR;

diff --git a/icu4c/source/test/cintltst/cdattst.c b/icu4c/source/test/cintltst/cdattst.c
@@ -51,6 +51,7 @@ static void TestNarrowQuarters(void);
 static void TestExtraneousCharacters(void);
 static void TestParseTooStrict(void);
 static void TestHourCycle(void);
+static void TestLocaleNameCrash(void);
 
 void addDateForTest(TestNode** root);
 
@@ -76,6 +77,7 @@ void addDateForTest(TestNode** root)
     TESTCASE(TestExtraneousCharacters);
     TESTCASE(TestParseTooStrict);
     TESTCASE(TestHourCycle);
+    TESTCASE(TestLocaleNameCrash);
 }
 /* Testing the DateFormat API */
 static void TestDateFormat()
@@ -2129,4 +2131,17 @@ static void TestHourCycle(void) {
     }
 }
 
+static void TestLocaleNameCrash(void) {
+    UErrorCode status = U_ZERO_ERROR;
+    UDateFormat icudf;
+
+    icudf = udat_open(UDAT_MEDIUM, UDAT_NONE, "notalanguage", NULL, 0, NULL, 0, &status);
+    if ( U_SUCCESS(status) ) {
+        log_verbose("Success: did not crash on udat_open(locale=\"notalanguage\")\n");
+    } else {
+        log_err("FAIL: didn't crash on udat_open(locale=\"notalanguage\"), but got %s.\n", u_errorName(status));
+    }
+    udat_close(icudf);
+}
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp
@@ -135,6 +135,7 @@ void DateFormatTest::runIndexedTest( int32_t index, UBool exec, const char* &nam
     TESTCASE_AUTO(TestNumericFieldStrictParse);
     TESTCASE_AUTO(TestHourCycle);
     TESTCASE_AUTO(TestHCInLocale);
+    TESTCASE_AUTO(TestBogusLocale);
 
     TESTCASE_AUTO_END;
 }
@@ -5876,6 +5877,14 @@ void DateFormatTest::TestHourCycle() {
     }
 }
 
+void DateFormatTest::TestBogusLocale() {
+    IcuTestErrorCode status(*this, "TestBogusLocale");
+    LocalPointer<DateFormat> df;
+
+    df.adoptInstead(DateFormat::createDateTimeInstance(DateFormat::kNone, DateFormat::kMedium,
+                    Locale("notalanguage")));
+}
+
 void DateFormatTest::TestHCInLocale() {
     IcuTestErrorCode status(*this, "TestHCInLocale");
     LocalPointer<Calendar> midnight(Calendar::createInstance(status));

diff --git a/icu4c/source/test/intltest/dtfmttst.h b/icu4c/source/test/intltest/dtfmttst.h
@@ -270,6 +270,7 @@ class DateFormatTest: public CalendarTimeZoneTest {
     void TestNumericFieldStrictParse();
     void TestHourCycle();
     void TestHCInLocale();
+    void TestBogusLocale();
 
 private:
     UBool showParse(DateFormat &format, const UnicodeString &formattedString);