From c978b2c5e9dcd8e6b5396885aab8b2258e3f75fc Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 5 Jun 2016 11:01:38 -0400 Subject: [PATCH] code review re. https://bugzilla.mozilla.org/show_bug.cgi?id=1259169 --- platform/firefox/vapi-background.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js index bf7518a..acf2eb4 100644 --- a/platform/firefox/vapi-background.js +++ b/platform/firefox/vapi-background.js @@ -3310,7 +3310,11 @@ vAPI.cookies.observe = function(subject, topic, reason) { return; } if ( subject instanceof Ci.nsICookie2 === false ) { - subject = subject.QueryInterface(Ci.nsICookie2); + try { + subject = subject.QueryInterface(Ci.nsICookie2); + } catch (ex) { + return; + } } if ( reason === 'deleted' ) { if ( typeof this.onRemoved === 'function' ) { @@ -3351,8 +3355,8 @@ vAPI.cookies.getAll = function(callback) { vAPI.cookies.remove = function(details, callback) { var uri = Services.io.newURI(details.url, null, null); var cookies = Services.cookies; - cookies.remove(uri.asciiHost, details.name, uri.path, false); - cookies.remove( '.' + uri.asciiHost, details.name, uri.path, false); + cookies.remove(uri.asciiHost, details.name, uri.path, false, {}); + cookies.remove( '.' + uri.asciiHost, details.name, uri.path, false, {}); if ( typeof callback === 'function' ) { callback({ domain: uri.asciiHost,