[Pkg-mozext-commits] [firebug] 40/55: Fix cookie URI + avoid NPE

[David Prévot]

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

taffit pushed a commit to tag firebug-1.10.1
in repository firebug.

commit 62f70a61c0963edecfa49e85f08f593c402b0635
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Mon Jul 30 16:27:01 2012 +0200

    Fix cookie URI + avoid NPE
---
 extension/content/firebug/cookies/cookie.js       | 7 +++++--
 extension/content/firebug/cookies/httpObserver.js | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/extension/content/firebug/cookies/cookie.js b/extension/content/firebug/cookies/cookie.js
index 667891d..ada86f4 100644
--- a/extension/content/firebug/cookies/cookie.js
+++ b/extension/content/firebug/cookies/cookie.js
@@ -127,10 +127,13 @@ Cookie.prototype =
         try
         {
             var host = this.cookie.host;
+            var path = this.cookie.path;
+
             var httpProtocol = this.cookie.isSecure ? "https://" : "http://";
-            return ioService.newURI(httpProtocol + host + this.cookie.path, null, null);
+            var uri = httpProtocol + host + (path ? path : "");
+            return ioService.newURI(uri, null, null);
         }
-        catch(exc)
+        catch (exc)
         {
             if (FBTrace.DBG_ERRORS || FBTrace.DBG_COOKIES)
                 FBTrace.sysout("cookies.getURI FAILS for " + this.cookie.name);
diff --git a/extension/content/firebug/cookies/httpObserver.js b/extension/content/firebug/cookies/httpObserver.js
index 58878e2..a82510f 100644
--- a/extension/content/firebug/cookies/httpObserver.js
+++ b/extension/content/firebug/cookies/httpObserver.js
@@ -199,6 +199,9 @@ var HttpObserver = Obj.extend(BaseObserver,
         if (!context.cookies.activeCookies)
             context.cookies.activeCookies = [];
 
+        if (!activeHost)
+            return;
+
         var activeCookies = context.cookies.activeCookies;
 
         // xxxHonza

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