From 5e9e6d947172fc4cadae8d15b5cdcf7538a9de50 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Thu, 6 May 2010 10:22:44 -0700
Subject: [PATCH] Bug 553956: AddonProviders that contain syntax errors can
 break everything. r=robstrong

---
 toolkit/mozapps/extensions/AddonManager.jsm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm
index 51e57394eafa..2f7f8c218687 100644
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -213,7 +213,12 @@ var AddonManagerInternal = {
 
     // Ensure all default providers have had a chance to register themselves
     PROVIDERS.forEach(function(url) {
-      Components.utils.import(url, {});
+      try {
+        Components.utils.import(url, {});
+      }
+      catch (e) {
+        ERROR("Exception loading provider \"" + url + "\": " + e);
+      }
     });
 
     let needsRestart = false;