From 10f9310e623b77b080a0cc2eb32b614306eeef90 Mon Sep 17 00:00:00 2001
From: "karnaze%netscape.com"
 <karnaze%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 5 Sep 2001 14:05:01 +0000
Subject: [PATCH] bug 95688 - null check on base url which might fix the
 talkback reports. sr=kin, r=alexsavulov.

git-svn-id: svn://10.0.0.236/trunk@102295 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsFrameFrame.cpp           | 2 ++
 mozilla/layout/html/document/src/nsFrameFrame.cpp | 2 ++
 2 files changed, 4 insertions(+)

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);