1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: fix wrong default for v8 handle zapping

Browse Source 
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>
This commit is contained in:
Refael Ackermann 2018-10-21 09:04:43 -04:00
parent d901d16b39
commit c9b49a64fe
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.gypi
View File

@ -33,7 +33,7 @@
# Reset this number to 0 on major V8 upgrades. # Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8. # Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.5', 'v8_embedder_string': '-node.6',
# Enable disassembler for `--print-code` v8 options # Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1, 'v8_enable_disassembler': 1,

11
deps/v8/gypfiles/features.gypi vendored
View File

@ -103,7 +103,9 @@
# Enable mitigations for executing untrusted code. # Enable mitigations for executing untrusted code.
'v8_untrusted_code_mitigations%': 'true', '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': { 'target_defaults': {
'conditions': [ 'conditions': [
@ -164,9 +166,10 @@
['v8_untrusted_code_mitigations=="false"', { ['v8_untrusted_code_mitigations=="false"', {
'defines': ['DISABLE_UNTRUSTED_CODE_MITIGATIONS',], 'defines': ['DISABLE_UNTRUSTED_CODE_MITIGATIONS',],
}], }],
['v8_enable_handle_zapping==1', { # Refs: https://github.com/nodejs/node/pull/23801
'defines': ['ENABLE_HANDLE_ZAPPING',], # ['v8_enable_handle_zapping==1', {
}], # 'defines': ['ENABLE_HANDLE_ZAPPING',],
# }],
], # conditions ], # conditions
'defines': [ 'defines': [
'V8_GYP_BUILD', 'V8_GYP_BUILD',

6
deps/v8/gypfiles/toolchain.gypi vendored
View File

@ -1321,6 +1321,10 @@
}, { }, {
'inherit_from': ['DebugBase1'], 'inherit_from': ['DebugBase1'],
}], }],
# Temporary refs: https://github.com/nodejs/node/pull/23801
['v8_enable_handle_zapping==1', {
'defines': ['ENABLE_HANDLE_ZAPPING',],
}],
], ],
}, # Debug }, # Debug
'ReleaseBase': { 'ReleaseBase': {
@ -1405,6 +1409,8 @@
}, # Release }, # Release
'Release': { 'Release': {
'inherit_from': ['ReleaseBase'], 'inherit_from': ['ReleaseBase'],
# Temporary refs: https://github.com/nodejs/node/pull/23801
'defines!': ['ENABLE_HANDLE_ZAPPING',],
}, # Debug }, # Debug
'conditions': [ 'conditions': [
[ 'OS=="win"', { [ 'OS=="win"', {