Bug 1418438 - Avoid null deref in nsIDocShell's forcedCharset. r=emk

MozReview-Commit-ID: KsTWmlAhDp8
2017-11-17 21:28:50 +01:00
parent 0beac6499b
commit f591258e18
1 changed files with 5 additions and 1 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -2187,7 +2187,11 @@ nsDocShell::SetForcedCharset(const nsACString& aCharset)
 NS_IMETHODIMP
 nsDocShell::GetForcedCharset(nsACString& aResult)
 {
-  mForcedCharset->Name(aResult);
+  if (mForcedCharset) {
+    mForcedCharset->Name(aResult);
+  } else {
+    aResult.Truncate();
+  }
  return NS_OK;
 }