Check for successful deserialize for TP and ad-block

Auditors: @SergeyZhukovsky Fix #6448 Fix #6449
brave · Jan 1, 2017 · 884c121 · 884c121 · SergeyZhukovsky · Jan 2, 2017
1 parent f17950e
commit 884c121
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/dataFile.js b/app/dataFile.js
@@ -99,8 +99,16 @@ module.exports.init = (resourceName, startExtension, onInitDone, forceDownload)
     // it's used directly
     // console.log('done init:', resourceName)
     cachedDataFiles[resourceName] = data
-    onInitDone(data)
-    startExtension()
+    if (onInitDone(data)) {
+      startExtension()
+    } else {
+      console.error(`Failed to deserialize data file for resource: ${resourceName}`)
+      fs.unlink(storagePath(url), (err) => {
+        if (err) {
+          console.error(`Could not remove unserializable data file for resource: ${resourceName}`)
+        }
+      })
+    }
   }
 
   const loadProcess = (resourceName, version) =>

diff --git a/app/httpsEverywhere.js b/app/httpsEverywhere.js
@@ -28,6 +28,7 @@ function loadRulesets (data) {
   var parsedData = JSON.parse(data)
   targets = parsedData.targets
   db = parsedData.rulesetStrings
+  return true
 }
 
 /**