diff options
author | Michaël Zasso <targos@protonmail.com> | 2018-03-08 10:19:35 +0100 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2018-03-15 14:45:03 +0100 |
commit | cac4da05ad91f12c1af97895b3a08e3190f6a97f (patch) | |
tree | c0d9052e0458d187f79a431b34d5d1a4da9e9fbd | |
parent | 54de79b16e6eaf0b85fb40133dfc0f15016ef103 (diff) | |
download | node-new-cac4da05ad91f12c1af97895b3a08e3190f6a97f.tar.gz |
deps: allow disabling V8 untrusted code mitigations
Add a GYP flag similar to the one defined in BUILD.gn.
PR-URL: https://github.com/nodejs/node/pull/19222
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Yang Guo <yangguo@chromium.org>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benedikt Meurer <benedikt.meurer@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
-rw-r--r-- | common.gypi | 2 | ||||
-rw-r--r-- | deps/v8/gypfiles/features.gypi | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi index a3aeff7e03..b2fa7874c2 100644 --- a/common.gypi +++ b/common.gypi @@ -27,7 +27,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.4', + 'v8_embedder_string': '-node.5', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/gypfiles/features.gypi b/deps/v8/gypfiles/features.gypi index d285ee21da..8c99b4f086 100644 --- a/deps/v8/gypfiles/features.gypi +++ b/deps/v8/gypfiles/features.gypi @@ -89,6 +89,9 @@ # Controls the threshold for on-heap/off-heap Typed Arrays. 'v8_typed_array_max_size_in_heap%': 64, + + # Enable mitigations for executing untrusted code. + 'v8_untrusted_code_mitigations%': 'true', }, 'target_defaults': { 'conditions': [ @@ -143,6 +146,9 @@ ['v8_enable_concurrent_marking==1', { 'defines': ['V8_CONCURRENT_MARKING',], }], + ['v8_untrusted_code_mitigations=="false"', { + 'defines': ['DISABLE_UNTRUSTED_CODE_MITIGATIONS',], + }], ], # conditions 'configurations': { 'DebugBaseCommon': { |