[Pkg-mozext-commits] [requestpolicy] 56/65: [fix] subscriptions: "sub is undefined"

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit d9c82b216da6353f49fb2e0f871ad0afa67a606b
Author: Martin Kimmerle <dev at 256k.de>
Date:   Wed Feb 3 22:40:16 2016 +0100

    [fix] subscriptions: "sub is undefined"
    
    fix JavaScript Error: "TypeError: sub is undefined"
---
 src/content/lib/subscription.jsm                   | 27 +++++++++++++++-------
 .../dev-helper/content/console-observer.jsm        |  2 --
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/content/lib/subscription.jsm b/src/content/lib/subscription.jsm
index 2bbf659..f3ba22e 100644
--- a/src/content/lib/subscription.jsm
+++ b/src/content/lib/subscription.jsm
@@ -314,15 +314,20 @@ SubscriptionList.prototype = {
   updateSubscriptions: function(userSubs, successCallback, errorCallback) {
     /* jshint -W083 */ // Don't make functions within a loop.
     for (let subName in userSubs) {
-      let sub;
+      let serial = this.getSubscriptionSerial(subName);
+      if (serial === null) {
+        continue;
+      }
+      dprint("Current serial for " + this._name + " " + subName + ": " +
+             userSubs[subName].serial);
+      dprint("Available serial for " + this._name + " " + subName + ": " +
+             serial);
+      let subUrl = this.getSubscriptionUrl(subName);
+      if (subUrl === null) {
+        continue;
+      }
+      let sub = new Subscription(this._name, subName, subUrl);
       try {
-        var serial = this.getSubscriptionSerial(subName);
-        dprint("Current serial for " + this._name + " " + subName + ": " +
-               userSubs[subName].serial);
-        dprint("Available serial for " + this._name + " " + subName + ": " +
-               serial);
-        var subUrl = this.getSubscriptionUrl(subName);
-        sub = new Subscription(this._name, subName, subUrl);
         if (serial > userSubs[subName].serial) {
           sub.update(successCallback, errorCallback);
         } else {
@@ -349,10 +354,16 @@ SubscriptionList.prototype = {
   // },
 
   getSubscriptionSerial: function(subName) {
+    if (!(subName in this._data.subscriptions)) {
+      return null;
+    }
     return this._data.subscriptions[subName].serial;
   },
 
   getSubscriptionUrl: function(subName) {
+    if (!(subName in this._data.subscriptions)) {
+      return null;
+    }
     return this._data.subscriptions[subName].url;
   }
 };
diff --git a/tests/helper-addons/dev-helper/content/console-observer.jsm b/tests/helper-addons/dev-helper/content/console-observer.jsm
index 104e8ab..e63ca3e 100644
--- a/tests/helper-addons/dev-helper/content/console-observer.jsm
+++ b/tests/helper-addons/dev-helper/content/console-observer.jsm
@@ -52,8 +52,6 @@ function isRPException(aMessage) {
 
 // jscs:disable maximumLineLength
 const knownBugs = [
-  // issue #597
-  `[JavaScript Error: "TypeError: sub is undefined" {file: "chrome://rpcontinued/content/lib/subscription.jsm"`,
   `[JavaScript Warning: "Expected end of value but found '10'.  Error in parsing value for 'font-family'.  Declaration dropped." {file: "chrome://rpcontinued/skin/`,
 ];
 // jscs:enable maximumLineLength

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git