diff options
| author | Refael Ackermann <refack@gmail.com> | 2018-10-21 09:04:43 -0400 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2018-10-23 10:57:47 -0400 |
| commit | c9b49a64fec997438fe0f734839edbaedfa2ad25 (patch) | |
| tree | 4aff88d9bcecf3d4c5fa79cc6b0361c3c45cdcac /deps/v8 | |
| parent | d901d16b395e59f3f898e1f2527cb539ca97a077 (diff) | |
| download | android-node-v8-c9b49a64fec997438fe0f734839edbaedfa2ad25.tar.gz android-node-v8-c9b49a64fec997438fe0f734839edbaedfa2ad25.tar.bz2 android-node-v8-c9b49a64fec997438fe0f734839edbaedfa2ad25.zip | |
deps: fix wrong default for v8 handle zapping
PR-URL: https://github.com/nodejs/node/pull/23801
Fixes: https://github.com/nodejs/node/issues/23796
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Matheus Marchini <mat@mmarchini.me>
Diffstat (limited to 'deps/v8')
| -rw-r--r-- | deps/v8/gypfiles/features.gypi | 11 | ||||
| -rw-r--r-- | deps/v8/gypfiles/toolchain.gypi | 6 |
2 files changed, 13 insertions, 4 deletions
diff --git a/deps/v8/gypfiles/features.gypi b/deps/v8/gypfiles/features.gypi index 35a078e8af..618949124a 100644 --- a/deps/v8/gypfiles/features.gypi +++ b/deps/v8/gypfiles/features.gypi @@ -103,7 +103,9 @@ # Enable mitigations for executing untrusted code. 'v8_untrusted_code_mitigations%': 'true', - 'v8_enable_handle_zapping%': 1, + # Currently set for node by common.gypi, avoiding default because of gyp file bug. + # Should be turned on only for debugging. + #'v8_enable_handle_zapping%': 0, }, 'target_defaults': { 'conditions': [ @@ -164,9 +166,10 @@ ['v8_untrusted_code_mitigations=="false"', { 'defines': ['DISABLE_UNTRUSTED_CODE_MITIGATIONS',], }], - ['v8_enable_handle_zapping==1', { - 'defines': ['ENABLE_HANDLE_ZAPPING',], - }], + # Refs: https://github.com/nodejs/node/pull/23801 + # ['v8_enable_handle_zapping==1', { + # 'defines': ['ENABLE_HANDLE_ZAPPING',], + # }], ], # conditions 'defines': [ 'V8_GYP_BUILD', diff --git a/deps/v8/gypfiles/toolchain.gypi b/deps/v8/gypfiles/toolchain.gypi index 7f497fac91..ea8f1c2f00 100644 --- a/deps/v8/gypfiles/toolchain.gypi +++ b/deps/v8/gypfiles/toolchain.gypi @@ -1321,6 +1321,10 @@ }, { 'inherit_from': ['DebugBase1'], }], + # Temporary refs: https://github.com/nodejs/node/pull/23801 + ['v8_enable_handle_zapping==1', { + 'defines': ['ENABLE_HANDLE_ZAPPING',], + }], ], }, # Debug 'ReleaseBase': { @@ -1405,6 +1409,8 @@ }, # Release 'Release': { 'inherit_from': ['ReleaseBase'], + # Temporary refs: https://github.com/nodejs/node/pull/23801 + 'defines!': ['ENABLE_HANDLE_ZAPPING',], }, # Debug 'conditions': [ [ 'OS=="win"', { |