Skip to content

Only pre-initialize ICU when using Windows Kit ICU #5011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chakrabot merged 1 commit into from
Apr 22, 2018
Merged

Only pre-initialize ICU when using Windows Kit ICU #5011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions lib/Runtime/Library/IntlEngineInterfaceExtensionObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,22 +503,29 @@ namespace Js
#else
library->AddMember(intlNativeInterfaces, Js::PropertyIds::winglob, library->GetFalse());

// when using ICU, we need to call u_init to ensure that ICU is functioning properly before allowing Intl to continue.
// u_init will cause the data file to be loaded, and if we don't have enough memory to do so, we can throw OutOfMemory here.
// when using ICU, we can call ulocdata_getCLDRVersion to ensure that ICU is functioning properly before allowing Intl to continue.
// ulocdata_getCLDRVersion will cause the data file to be loaded, and if we don't have enough memory to do so, we can throw OutOfMemory here.
// This is to protect against spurious U_MISSING_RESOURCE_ERRORs and U_FILE_ACCESS_ERRORs coming from early-lifecycle
// functions that require ICU data.
// See OS#16897150, OS#16896933, and others relating to bad statuses returned by GetLocaleData and IsLocaleAvailable
// This was initially attempted using u_init, however u_init does not work with Node's default small-icu data file
// because it contains no converters.
UErrorCode status = U_ZERO_ERROR;
u_init(&status);
UVersionInfo cldrVersion;
ulocdata_getCLDRVersion(cldrVersion, &status);
if (status == U_MEMORY_ALLOCATION_ERROR || status == U_FILE_ACCESS_ERROR || status == U_MISSING_RESOURCE_ERROR)
{
// Trace that this happens in case there are build system changes that actually cause the data file to be not found
INTL_TRACE("Could not initialize ICU - u_init returned status %S", u_errorName(status));
INTL_TRACE("Could not initialize ICU - ulocdata_getCLDRVersion returned status %S", u_errorName(status));
Throw::OutOfMemory();
}
else
{
INTL_TRACE("Using CLDR version %d.%d.%d.%d", cldrVersion[0], cldrVersion[1], cldrVersion[2], cldrVersion[3]);
}

AssertOrFailFastMsg(U_SUCCESS(status), "u_init returned non-OOM failure");
#endif
AssertOrFailFastMsg(U_SUCCESS(status), "ulocdata_getCLDRVersion returned non-OOM failure");
#endif // else !INTL_WINGLOB

intlNativeInterfaces->SetHasNoEnumerableProperties(true);

Expand Down
1 change: 1 addition & 0 deletions lib/Runtime/PlatformAgnostic/ChakraICU.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "unicode/udat.h"
#include "unicode/udatpg.h"
#include "unicode/uloc.h"
#include "unicode/ulocdata.h"
#include "unicode/unumsys.h"
#include "unicode/ustring.h"
#include "unicode/unorm2.h"
Expand Down