Fix leak with change listeners in frame

Auditors: @bridiver Fix #8244 Auditors: @bridiver
brave · Apr 12, 2017 · 657689d · 657689d
1 parent 3efe3a8
commit 657689d
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/js/components/frame.js b/js/components/frame.js
@@ -52,6 +52,7 @@ class Frame extends ImmutableComponent {
     super()
     this.onUpdateWheelZoom = debounce(this.onUpdateWheelZoom.bind(this), 20)
     this.onFocus = this.onFocus.bind(this)
+    this.onAppStateChange = this.onAppStateChange.bind(this)
     // Maps notification message to its callback
     this.notificationCallbacks = {}
     // Counter for detecting PDF URL redirect loops
@@ -296,6 +297,7 @@ class Frame extends ImmutableComponent {
   }
 
   componentWillUnmount () {
+    appStoreRenderer.removeChangeListener(this.onAppStateChange)
     this.expireContentSettings(this.origin)
   }
 
@@ -358,14 +360,15 @@ class Frame extends ImmutableComponent {
     this.updateAboutDetails(prevProps)
   }
 
-  componentDidMount () {
-    appStoreRenderer.addChangeListener(() => {
-      if (!this.frame.isEmpty() && this.tab && !this.tab.delete('frame').equals(this.lastTab)) {
-        windowActions.tabDataChanged(this.frame, this.tab)
-      }
-      this.lastTab = this.tab && this.tab.delete('frame')
-    })
+  onAppStateChange () {
+    if (!this.frame.isEmpty() && this.tab && !this.tab.delete('frame').equals(this.lastTab)) {
+      windowActions.tabDataChanged(this.frame, this.tab)
+    }
+    this.lastTab = this.tab && this.tab.delete('frame')
+  }
 
+  componentDidMount () {
+    appStoreRenderer.addChangeListener(this.onAppStateChange)
     if (this.props.isActive) {
       windowActions.setActiveFrame(this.frame)
     }