[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] Bug 33342: Avoid disconnect search addon error after removal.

[sysrqb at torproject.org]

commit 37efb50ed54462961a999797de74e8312aa2f8ac
Author: Alex Catarineu <acat at torproject.org>
Date:   Fri Mar 13 18:19:30 2020 +0100

    Bug 33342: Avoid disconnect search addon error after removal.
    
    We removed the addon in #32767, but it was still being loaded
    from addonStartup.json.lz4 and throwing an error on startup
    because its resource: location is not available anymore.
---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 5e467fb4f14c..794c206fb453 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -970,6 +970,12 @@ var BuiltInLocation = new (class _BuiltInLocation extends XPIStateLocation {
   get enumerable() {
     return false;
   }
+
+  restore(saved) {
+    super.restore(saved);
+    // Bug 33342: avoid restoring disconnect addon from addonStartup.json.lz4.
+    this.removeAddon("disconnect at search.mozilla.org");
+  }
 })();
 
 /**