Skip to content

Commit e8bc285

Browse files
Micah Leepde
authored andcommitted
bug sqashing
1 parent f3ff42e commit e8bc285

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

‎src/chrome/content/code/HTTPSRules.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,12 @@ const HTTPSRules = {
343343
// applicable rulesets are and aren't active.
344344
var i = 0;
345345
var newuri = null
346-
var rs = this.potentiallyApplicableRulesets(uri.host);
346+
try {
347+
var rs = this.potentiallyApplicableRulesets(uri.host);
348+
} catch(e) {
349+
this.log(WARN, 'Could not check applicable rules for '+uri.spec);
350+
return null;
351+
}
347352
if (!alist)
348353
this.log(DBUG, "No applicable list rewriting " + uri.spec);
349354
for(i = 0; i < rs.length; ++i) {

‎src/components/https-everywhere.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ HTTPSEverywhere.prototype = {
306306
var lst = this.getApplicableListForChannel(channel);
307307
HTTPS.replaceChannel(lst, channel);
308308
} else if (topic == "http-on-examine-response") {
309-
this.log(DBUG, "Got http-on-examine-response @ "+ channel.URI.spec );
309+
this.log(DBUG, "Got http-on-examine-response @ "+ (channel.URI ? channel.URI.spec : '') );
310310
HTTPS.handleSecureCookies(channel);
311311
} else if (topic == "http-on-examine-merged-response") {
312312
this.log(DBUG, "Got http-on-examine-merged-response ");

0 commit comments

Comments
 (0)