diff options
| author | Steven R. Loomis <srloomis@us.ibm.com> | 2016-04-15 21:35:53 -0700 |
|---|---|---|
| committer | Steven R. Loomis <srloomis@us.ibm.com> | 2016-05-04 15:02:25 -0700 |
| commit | cd752e8463fad7c4805951d9ba47cd2f39691f2d (patch) | |
| tree | 3bdaaa4bc465b0a3fa00b519496cdf0aec729480 /src | |
| parent | bc8b525440c306470330450536743b993700d328 (diff) | |
| download | android-node-v8-cd752e8463fad7c4805951d9ba47cd2f39691f2d.tar.gz android-node-v8-cd752e8463fad7c4805951d9ba47cd2f39691f2d.tar.bz2 android-node-v8-cd752e8463fad7c4805951d9ba47cd2f39691f2d.zip | |
intl: Don't crash if v8BreakIterator not available
If the undocumented v8BreakIterator does not have data available,
monkeypatch it to throw an error instead of crashing.
Fixes: https://github.com/nodejs/node/issues/3111
PR-URL: https://github.com/nodejs/node/pull/4253
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'src')
| -rw-r--r-- | src/node.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/node.cc b/src/node.cc index 6f155a64a3..eb8805b219 100644 --- a/src/node.cc +++ b/src/node.cc @@ -2976,6 +2976,13 @@ void SetupProcessObject(Environment* env, READONLY_PROPERTY(versions, "icu", OneByteString(env->isolate(), U_ICU_VERSION)); + + if (icu_data_dir != nullptr) { + // Did the user attempt (via env var or parameter) to set an ICU path? + READONLY_PROPERTY(process, + "icu_data_dir", + OneByteString(env->isolate(), icu_data_dir)); + } #endif const char node_modules_version[] = NODE_STRINGIFY(NODE_MODULE_VERSION); |