summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-03-03 21:23:39 +0100
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-03-03 21:23:39 +0100
commitc1ba23a015a2e85b2290a1cdfb0d697381b3cd2a (patch)
tree8a9f631bae906170978c5667f4c9302b899dd441
parentd252c5b2320859c58900b68a7f5ac82199aa1e83 (diff)
downloadUXP-c1ba23a015a2e85b2290a1cdfb0d697381b3cd2a.tar
UXP-c1ba23a015a2e85b2290a1cdfb0d697381b3cd2a.tar.gz
UXP-c1ba23a015a2e85b2290a1cdfb0d697381b3cd2a.tar.lz
UXP-c1ba23a015a2e85b2290a1cdfb0d697381b3cd2a.tar.xz
UXP-c1ba23a015a2e85b2290a1cdfb0d697381b3cd2a.zip
The origin should not contain the ref part of the URL
-rw-r--r--caps/nsPrincipal.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/caps/nsPrincipal.cpp b/caps/nsPrincipal.cpp
index 4cb472369..f89061043 100644
--- a/caps/nsPrincipal.cpp
+++ b/caps/nsPrincipal.cpp
@@ -184,8 +184,23 @@ nsPrincipal::GetOriginForURI(nsIURI* aURI, nsACString& aOrigin)
// origin string
nsCOMPtr<nsIStandardURL> standardURL = do_QueryInterface(origin);
NS_ENSURE_TRUE(standardURL, NS_ERROR_FAILURE);
+
rv = origin->GetAsciiSpec(aOrigin);
NS_ENSURE_SUCCESS(rv, rv);
+
+ // The origin, when taken from the spec, should not contain the ref part of
+ // the URL.
+
+ int32_t pos = aOrigin.FindChar('?');
+ int32_t hashPos = aOrigin.FindChar('#');
+
+ if (hashPos != kNotFound && (pos == kNotFound || hashPos < pos)) {
+ pos = hashPos;
+ }
+
+ if (pos != kNotFound) {
+ aOrigin.Truncate(pos);
+ }
}
return NS_OK;