RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 06:58:11 +00:00
Code Issues Activity Actions

LibJS: Avoid crashing when the Unicode data generators are disabled

Browse source 
The general idea when ENABLE_UNICODE_DATABASE_DOWNLOAD is OFF has been
that the Intl APIs will provide obviously incorrect results, but should
not crash. This regressed a bit with NumberFormat and DateTimeFormat.
This commit is contained in:
Timothy Flynn 2021-12-22 08:55:49 -05:00 • committed by Linus Groh
parent 48dc28996d
commit 9ce4ff4265
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp
View file

@ -135,13 +135,16 @@ ThrowCompletionOr<DateTimeFormat*> initialize_date_time_format(GlobalObject& glo
// 19. Let calendar be r.[[ca]].
// 20. Set dateTimeFormat.[[Calendar]] to calendar.
date_time_format.set_calendar(result.ca.release_value());
if (result.ca.has_value())
date_time_format.set_calendar(result.ca.release_value());
// 21. Set dateTimeFormat.[[HourCycle]] to r.[[hc]].
date_time_format.set_hour_cycle(result.hc.release_value());
if (result.hc.has_value())
date_time_format.set_hour_cycle(result.hc.release_value());
// 22. Set dateTimeFormat.[[NumberingSystem]] to r.[[nu]].
date_time_format.set_numbering_system(result.nu.release_value());
if (result.nu.has_value())
date_time_format.set_numbering_system(result.nu.release_value());
// 23. Let dataLocale be r.[[dataLocale]].
auto data_locale = move(result.data_locale);