Fix inpage.js event handler memory leak (#6177)

Fixes #6176
MetaMask · Feb 18, 2019 · 89c4353 · 89c4353
1 parent b58a9bd
commit 89c4353
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
@@ -29,12 +29,13 @@ console.warn('ATTENTION: In an effort to improve user privacy, MetaMask ' +
  * @param {Function} handler - event handler
  * @param {boolean} remove - removes this handler after being triggered
  */
-function onMessage (messageType, handler, remove) {
-  window.addEventListener('message', function ({ data }) {
+function onMessage (messageType, callback, remove) {
+  const handler = function ({ data }) {
     if (!data || data.type !== messageType) { return }
     remove && window.removeEventListener('message', handler)
-    handler.apply(window, arguments)
-  })
+    callback.apply(window, arguments)
+  }
+  window.addEventListener('message', handler)
 }
 
 //