Track visited parents and null out cycles

kevinsawicki · kevinsawicki · commit 1944fdc962c5 · 2017-01-06T09:58:40.000-08:00
diff --git a/lib/browser/guest-window-manager.js b/lib/browser/guest-window-manager.js
@@ -7,19 +7,25 @@ const hasProp = {}.hasOwnProperty
 const frameToGuest = {}
 
 // Copy attribute of |parent| to |child| if it is not defined in |child|.
-const mergeOptions = function (child, parent) {
-  let key, value
-  for (key in parent) {
+const mergeOptions = function (child, parent, visited) {
+  // Check for circular reference.
+  if (visited == null) visited = new Set()
+  if (visited.has(parent)) return
+
+  visited.add(parent)
+  for (const key in parent) {
     if (!hasProp.call(parent, key)) continue
-    value = parent[key]
-    if (!(key in child)) {
-      if (typeof value === 'object') {
-        child[key] = mergeOptions({}, value)
-      } else {
-        child[key] = value
-      }
+    if (key in child) continue
+
+    const value = parent[key]
+    if (typeof value === 'object') {
+      child[key] = mergeOptions({}, value, visited)
+    } else {
+      child[key] = value
     }
   }
+  visited.delete(parent)
+
   return child
 }
 
diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js
@@ -270,10 +270,13 @@ describe('chromium feature', function () {
       w = BrowserWindow.fromId(ipcRenderer.sendSync('create-window-with-options-cycle'))
       w.loadURL('file://' + fixtures + '/pages/window-open.html')
       w.webContents.once('new-window',  (event, url, frameName, disposition, options) => {
-        assert.deepEqual(options, {
-          show: false,
-          foo: {
-            bar: null
+        assert.equal(options.show, false)
+        assert.deepEqual(options.foo, {
+          bar: null,
+          baz: {
+            hello: {
+              world: true
+            }
           }
         })
         done()
diff --git a/spec/static/main.js b/spec/static/main.js
@@ -237,6 +237,11 @@ ipcMain.on('create-window-with-options-cycle', (event) => {
   // nulled out at the IPC layer
   const foo = {}
   foo.bar  = foo
+  foo.baz = {
+    hello: {
+      world: true
+    }
+  }
   const window = new BrowserWindow({show: false, foo: foo})
   event.returnValue = window.id
 })
