1 files changed, 15 insertions, 0 deletions
diff --git a/caps/nsPrincipal.cpp b/caps/nsPrincipal.cpp
index 4cb4723694..f890610430 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;