From 580c3885dfab7c8ceb86d7a74a82e69f090963f9 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Fri, 15 Mar 2019 07:47:36 -0400
Subject: [PATCH] Fix typo which could lead to improper filtering context

Related discussion:
- https://github.com/uBlockOrigin/uAssets/commit/354ac4f57b32d0408e1b90b969733f2d9baa2e44#commitcomment-32715209
---
 src/js/filtering-context.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/js/filtering-context.js b/src/js/filtering-context.js
index 54b091e04..4b0ec5b30 100644
--- a/src/js/filtering-context.js
+++ b/src/js/filtering-context.js
@@ -76,18 +76,21 @@
             } else if ( details.documentUrl !== undefined ) {
                 this.setDocOriginFromURL(details.documentUrl);
             } else {
-                const pageStore = µBlock.pageStoreFromTabId(this.docId);
+                const pageStore = µBlock.pageStoreFromTabId(this.tabId);
                 const docStore = pageStore && pageStore.frames.get(this.docId);
                 if ( docStore ) {
                     this.docOrigin = undefined;
                     this.docHostname = docStore.pageHostname;
                     this.docDomain = docStore.pageDomain;
+                } else {
+                    this.setDocOrigin(this.tabOrigin);
                 }
             }
         } else if ( details.documentUrl !== undefined ) {
-            const normalURL = µBlock.normalizePageURL(0, details.documentUrl);
-            this.setTabOriginFromURL(normalURL);
-            this.setDocOriginFromURL(normalURL);
+            const origin = this.originFromURI(
+                µBlock.normalizePageURL(0, details.documentUrl)
+            );
+            this.setDocOrigin(origin).setTabOrigin(origin);
         } else if ( this.type === 'sub_frame' ) {
             const origin = this.originFromURI(this.url);
             this.setDocOrigin(origin).setTabOrigin(origin);