diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index d98d214f412..70ba62ac549 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -1190,6 +1190,8 @@ nsHTMLFrameInnerFrame::DoLoadURL(nsIPresContext* aPresContext) doc->GetBaseURL(*getter_AddRefs(baseURL)); } } + if (!baseURL) return NS_ERROR_NULL_POINTER; + nsAutoString absURL; rv = NS_MakeAbsoluteURI(absURL, url, baseURL); NS_ENSURE_SUCCESS(rv, rv); diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index d98d214f412..70ba62ac549 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -1190,6 +1190,8 @@ nsHTMLFrameInnerFrame::DoLoadURL(nsIPresContext* aPresContext) doc->GetBaseURL(*getter_AddRefs(baseURL)); } } + if (!baseURL) return NS_ERROR_NULL_POINTER; + nsAutoString absURL; rv = NS_MakeAbsoluteURI(absURL, url, baseURL); NS_ENSURE_SUCCESS(rv, rv);