Bug 1100069 - have nsIHandlerService::getTypeFromExtension fail grace…

…fully and silently in xpcshell. r=bz
dothq · Dec 11, 2014 · 3c6202d · 3c6202d
1 parent 756e64c
commit 3c6202d
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/uriloader/exthandler/nsHandlerService.js b/uriloader/exthandler/nsHandlerService.js
@@ -457,6 +457,14 @@ HandlerService.prototype = {
     var fileExtension = aFileExtension.toLowerCase();
     var typeID;
 
+    // See bug 1100069 for why we want to fail gracefully and silently here.
+    try {
+      this._ds;
+    } catch (ex) {
+      Components.returnCode = Cr.NS_ERROR_NOT_AVAILABLE;
+      return;
+    }
+
     if (this._existsLiteralTarget(NC_FILE_EXTENSIONS, fileExtension))
       typeID = this._getSourceForLiteral(NC_FILE_EXTENSIONS, fileExtension);