Issue #910 part 3. Throw SyntaxError from Location::SetProtocol on URI parse failures.

1 files changed, 4 insertions, 1 deletions

diff --git a/dom/base/Location.cpp b/dom/base/Location.cpp
index 35da1cb8e4..e312cffe00 100644
--- a/dom/base/Location.cpp
+++ b/dom/base/Location.cpp
@@ -725,7 +725,7 @@ Location::SetProtocol(const nsAString& aProtocol)
 
   rv = uri->SetScheme(NS_ConvertUTF16toUTF8(Substring(start, iter)));
   if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+    return NS_ERROR_DOM_SYNTAX_ERR;
   }
   nsAutoCString newSpec;
   rv = uri->GetSpec(newSpec);
@@ -735,6 +735,9 @@ Location::SetProtocol(const nsAString& aProtocol)
   // We may want a new URI class for the new URI, so recreate it:
   rv = NS_NewURI(getter_AddRefs(uri), newSpec);
   if (NS_FAILED(rv)) {
+    if (rv == NS_ERROR_MALFORMED_URI) {
+      rv = NS_ERROR_DOM_SYNTAX_ERR;
+    }
     return rv;
   }