Bug 1329570 - Restore missing error check in mozilla::dom::Location::…

…GetPathname native in moebius
RealityRipple · Apr 22, 2018 · 8af1b0c · 8af1b0c
1 parent 95c4608
commit 8af1b0c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/dom/base/Location.cpp b/dom/base/Location.cpp
@@ -577,9 +577,10 @@ Location::GetPathname(nsAString& aPathname)
   aPathname.Truncate();
 
   nsCOMPtr<nsIURI> uri;
-  nsresult result = NS_OK;
-
-  result = GetURI(getter_AddRefs(uri));
+  nsresult result = GetURI(getter_AddRefs(uri));
+  if (NS_FAILED(result) || !uri) {
+    return result;
+  }
 
   nsCOMPtr<nsIURIWithQuery> url(do_QueryInterface(uri));
   if (url) {