always get current data for tabValue

auditors @bbondy @jonathansampson
brave · Dec 20, 2016 · 73db6f8 · 73db6f8
1 parent 795cfc2
commit 73db6f8
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/browser/api/extensions.js b/lib/browser/api/extensions.js
@@ -110,8 +110,7 @@ const createTabValue = function (tab) {
 
   tabs[tabId] = {}
   tabs[tabId].webContents = tab
-  tabs[tabId].tabValue = extensions.tabValue(tab)
-  sendToBackgroundPages('all', getSessionForTab(tabId), 'chrome-tabs-created', tabs[tabId].tabValue)
+  sendToBackgroundPages('all', getSessionForTab(tabId), 'chrome-tabs-created', getTabValue(tabId))
   return tabId
 }
 
@@ -126,7 +125,8 @@ var getWebContentsForTab = function (tabId) {
 }
 
 var getTabValue = function (tabId) {
-  return tabs[tabId] && tabs[tabId].tabValue
+  var tabContents = getWebContentsForTab(tabId)
+  return tabContents && !tabContents.isDestroyed() && extensions.tabValue(tabContents)
 }
 
 var getActiveTab = function (windowId) {
@@ -270,8 +270,7 @@ const chromeTabsUpdated = function (tabId) {
     return
   }
 
-  var tabContents = getWebContentsForTab(tabId)
-  let tabValue = tabs[tabId].tabValue = extensions.tabValue(tabContents)
+  let tabValue = getTabValue(tabId)
   let changeInfo = {}
 
   for (var key in tabValue) {