Bug 1329570 - Restore missing error check in mozilla::dom::Location::GetPathname. r?valentin.gosu draft
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Mon, 09 Jan 2017 15:53:01 +0900
changeset 457548 f115ef087da211cbb83d58603c9a5a586795c0f2
parent 457425 4ece183563a44eab8f410818aa2c7984992dbb8d
child 541511 73318ba940bc568d2a351aa0354d02321be14090
push id40811
push userVYV03354@nifty.ne.jp
push dateMon, 09 Jan 2017 06:54:01 +0000
reviewersvalentin.gosu
bugs1329570
milestone53.0a1
Bug 1329570 - Restore missing error check in mozilla::dom::Location::GetPathname. r?valentin.gosu MozReview-Commit-ID: 1g5Skn2R38c
dom/base/Location.cpp
--- 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);
   }