Add additional mitigation for nodejs/node#29501

simonbuchan · Sep 10, 2019 · e98eb2b · e98eb2b
1 parent 6094cde
commit e98eb2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -33,6 +33,12 @@
                     "DisableSpecificWarnings": [
                         4100
                     ]
+                },
+                # https://github.com/nodejs/node/issues/29501
+                "VCLinkerTool": {
+                    "OptimizeReferences": 2,             # /OPT:REF
+                    "EnableCOMDATFolding": 2,            # /OPT:ICF
+                    "LinkIncremental": 1                # disable incremental linking
                 }
             }
         }

diff --git a/build.js b/build.js
@@ -6,6 +6,10 @@ const node_gyp = require('node-gyp');
 // stripped down version of node-gyp/bin/node-gyp.js
 // runs main node-gyp logic, but copies .node output to root
 
+function parseGyp(path) {
+    return JSON.parse(fs.readFileSync(path, 'utf8').replace(/\#.+\n/, ''))
+}
+
 async function main() {
     const gyp = node_gyp();
     // reuse existing .node-gyp files
@@ -20,9 +24,9 @@ async function main() {
     for (const { name, args } of gyp.todo) {
         await promisify(gyp.commands[name])(args);
         if (name == "build") {
-            const binding = JSON.parse(fs.readFileSync(`${__dirname}/binding.gyp`));
+            const binding = parseGyp(`${__dirname}/binding.gyp`);
             // Compute build output dir the same way as node-gyp/lib/build.js
-            const config = JSON.parse(fs.readFileSync(`${__dirname}/build/config.gypi`, 'utf8').replace(/\#.+\n/, ''));
+            const config = parseGyp(`${__dirname}/build/config.gypi`);
             let buildType = config.target_defaults.default_configuration;
             if ('debug' in gyp.opts) {
                 buildType = gyp.opts.debug ? 'Debug' : 'Release';