From d0e02a56324df325ac9044672f4eff86f166c07e Mon Sep 17 00:00:00 2001 From: "caillon%returnzero.com" Date: Fri, 1 Feb 2008 20:31:14 +0000 Subject: [PATCH] Backing out the patch to bug 83536. I will reland this when 1.6a re-opens. r+sr=jst@netscape.com a=chofmann git-svn-id: svn://10.0.0.236/trunk@244700 18797224-902f-48f8-a5cc-f745e15eee43 --- .../extensions/schema-validation/src/nsSchemaLoader.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mozilla/extensions/schema-validation/src/nsSchemaLoader.cpp b/mozilla/extensions/schema-validation/src/nsSchemaLoader.cpp index 51c985be89f..0e086a687a7 100644 --- a/mozilla/extensions/schema-validation/src/nsSchemaLoader.cpp +++ b/mozilla/extensions/schema-validation/src/nsSchemaLoader.cpp @@ -43,7 +43,7 @@ // XPConnect includes #include "nsIXPConnect.h" #include "nsIScriptSecurityManager.h" -#include "nsIPrincipal.h" +#include "nsICodebasePrincipal.h" // XPCOM includes #include "nsIServiceManager.h" @@ -813,7 +813,10 @@ nsSchemaLoader::GetResolvedURI(const nsAString& aSchemaURI, nsCOMPtr principal; rv = secMan->GetSubjectPrincipal(getter_AddRefs(principal)); if (NS_SUCCEEDED(rv)) { - principal->GetURI(getter_AddRefs(baseURI)); + nsCOMPtr codebase = do_QueryInterface(principal); + if (codebase) { + codebase->GetURI(getter_AddRefs(baseURI)); + } } rv = NS_NewURI(aURI, aSchemaURI, nsnull, baseURI);