Bug 1329570 - Restore missing error check in mozilla::dom::Location::GetPathname. r?valentin.gosu
MozReview-Commit-ID: 1g5Skn2R38c
--- a/dom/base/Location.cpp
+++ b/dom/base/Location.cpp
@@ -571,19 +571,20 @@ Location::GetOrigin(nsAString& aOrigin)
}
NS_IMETHODIMP
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;
+ }
nsAutoCString file;
result = uri->GetFilePath(file);
if (NS_SUCCEEDED(result)) {
AppendUTF8toUTF16(file, aPathname);
}