Skip to content

Commit fa78ae3

Browse files
fix(web): guard parseBrowserLanguages against invalid locale tags (flutter#190651)
Fixes flutter#190510 Engine bootstrap calls DomLocale(language) for every navigator.languages entry with no validation. A bad tag (e.g. en-US@posix from Chromium when LANG is unset) throws during field init and leaves a blank page. Guard each tag with try/catch and skip invalid ones. If all fail, fall back to _defaultLocale (en-US). Tests: en-US@posix, mixed invalid+valid, empty list via debugOverrideBrowserLanguages. AI tools helped with drafting. --------- Signed-off-by: Sankalp Thakur <[email protected]> Co-authored-by: Mouad Debbar <[email protected]>
1 parent e4cb8ff commit fa78ae3

2 files changed

Lines changed: 34 additions & 9 deletions

File tree

‎engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,17 +1024,23 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
10241024

10251025
final locales = <ui.Locale>[];
10261026
for (final String language in languages) {
1027-
final domLocale = DomLocale(language);
1028-
locales.add(
1029-
ui.Locale.fromSubtags(
1030-
languageCode: domLocale.language,
1031-
scriptCode: domLocale.script,
1032-
countryCode: domLocale.region,
1033-
),
1034-
);
1027+
try {
1028+
final domLocale = DomLocale(language);
1029+
locales.add(
1030+
ui.Locale.fromSubtags(
1031+
languageCode: domLocale.language,
1032+
scriptCode: domLocale.script,
1033+
countryCode: domLocale.region,
1034+
),
1035+
);
1036+
} catch (_) {
1037+
// Skip tags Intl.Locale rejects (e.g. en-US@posix on Linux).
1038+
}
10351039
}
10361040

1037-
assert(locales.isNotEmpty);
1041+
if (locales.isEmpty) {
1042+
return const <ui.Locale>[_defaultLocale];
1043+
}
10381044
return locales;
10391045
}
10401046

‎engine/src/flutter/lib/web_ui/test/engine/platform_dispatcher/platform_dispatcher_test.dart‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,25 @@ void testMain() {
714714
ui.Locale('de', 'DE'),
715715
]);
716716
});
717+
718+
test('skips invalid tags such as en-US@posix and falls back to default locale', () {
719+
// Chromium on Linux with LANG unset can report en-US@posix, which
720+
// Intl.Locale rejects. The parse path must not throw during bootstrap.
721+
EnginePlatformDispatcher.debugOverrideBrowserLanguages(['en-US@posix']);
722+
addTearDown(() => EnginePlatformDispatcher.debugOverrideBrowserLanguages(null));
723+
724+
expect(EnginePlatformDispatcher.parseBrowserLanguages(), const [ui.Locale('en', 'US')]);
725+
});
726+
727+
test('keeps valid locales when some browser language tags are invalid', () {
728+
EnginePlatformDispatcher.debugOverrideBrowserLanguages(['en-US@posix', 'fr-FR', 'de-DE']);
729+
addTearDown(() => EnginePlatformDispatcher.debugOverrideBrowserLanguages(null));
730+
731+
expect(EnginePlatformDispatcher.parseBrowserLanguages(), const [
732+
ui.Locale('fr', 'FR'),
733+
ui.Locale('de', 'DE'),
734+
]);
735+
});
717736
});
718737

719738
group('AT Focus Handler Integration', () {

0 commit comments

Comments
 (0)