mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #11380 from electron/cifratila/enable-cfg

Browse source 
Security Improvement: Enable Control Flow Guard compile flag on Windows
This commit is contained in:
Charles Kerr 2017-12-08 10:09:34 -06:00 • committed by GitHub
commit 6af18895c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
brightray/brightray.gypi
View file

@ -244,9 +244,16 @@
# perform FPO regardless, so we must explicitly disable. # perform FPO regardless, so we must explicitly disable.
# We still want the false setting above to avoid having # We still want the false setting above to avoid having
# "/Oy /Oy-" and warnings about overriding. # "/Oy /Oy-" and warnings about overriding.
'AdditionalOptions': ['/Oy-'], 'AdditionalOptions': ['/Oy-', '/d2guard4'],
}, },
'VCLinkerTool': { 'VCLinkerTool': {
# Control Flow Guard is a security feature in Windows
# 8.1 and higher designed to prevent exploitation of
# indirect calls in executables.
# Control Flow Guard is enabled using the /d2guard4
# compiler setting in combination with the /guard:cf
# linker setting.
'AdditionalOptions': ['/guard:cf'],
# Turn off incremental linking to save binary size. # Turn off incremental linking to save binary size.
'LinkIncremental': '1', # /INCREMENTAL:NO 'LinkIncremental': '1', # /INCREMENTAL:NO
}, },