Account for PredefinedCulturesOnly in CultureInfo LCID .ctor (#87002)

dotnet · Jun 2, 2023 · f4ef5c8 · f4ef5c8
1 parent 0c85307
commit f4ef5c8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/libraries/System.Globalization/tests/Invariant/InvariantMode.cs b/src/libraries/System.Globalization/tests/Invariant/InvariantMode.cs
@@ -1196,6 +1196,16 @@ public void TestGetCultureInfo_PredefinedOnly_ReturnsSame()
             Assert.Equal(CultureInfo.GetCultureInfo("en-US"), CultureInfo.GetCultureInfo("en-US", predefinedOnly: true));
         }
 
+        [ConditionalTheory(nameof(PredefinedCulturesOnlyIsDisabled))]
+        [InlineData(0x0001)]
+        [InlineData(0x7c5C)]
+        [InlineData(0x03_0404)] // with sort id
+        [InlineData(0x007F)] // LOCALE_INVARIANT
+        public void TestCultureInfo_Ctor_Int32_ReturnsInvariant(int culture)
+        {
+            Assert.Equal(new CultureInfo(culture), CultureInfo.InvariantCulture);
+        }
+
         private static byte[] GetExpectedInvariantOrdinalSortKey(ReadOnlySpan<char> input)
         {
             MemoryStream memoryStream = new MemoryStream();

diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs
@@ -868,6 +868,16 @@ internal static CultureData GetCultureData(int culture, bool bUseUserOverride)
 
             if (GlobalizationMode.Invariant)
             {
+                if (!GlobalizationMode.PredefinedCulturesOnly)
+                {
+                    if (culture is < 1 or > 0xf_ffff)
+                    {
+                        throw new CultureNotFoundException(nameof(culture), culture, SR.Argument_CultureNotSupported);
+                    }
+
+                    return Invariant;
+                }
+
                 // LCID is not supported in the InvariantMode
                 throw new CultureNotFoundException(nameof(culture), culture, SR.Argument_CultureNotSupportedInInvariantMode);
             }