From f01bf79f81ed64cf76e55c830842827e33c7c74d Mon Sep 17 00:00:00 2001 From: "tbogard%aol.net" Date: Wed, 8 Dec 1999 05:01:06 +0000 Subject: [PATCH] fix for 21113 git-svn-id: svn://10.0.0.236/trunk@55726 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index b4724a6d90e..0ae958b4d4f 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -593,15 +593,17 @@ NS_IMETHODIMP nsDocShell::AddChild(nsIDocShellTreeItem *aChild) return NS_OK; // Do some docShell Specific stuff. - PRUnichar *defaultCharset=nsnull; - PRUnichar *forceCharset=nsnull; + nsXPIDLString defaultCharset; + nsXPIDLString forceCharset; NS_ENSURE_TRUE(mContentViewer, NS_ERROR_FAILURE); nsCOMPtr muDV = do_QueryInterface(mContentViewer); if(muDV) { - NS_ENSURE_SUCCESS(muDV->GetDefaultCharacterSet (&defaultCharset), NS_ERROR_FAILURE); - NS_ENSURE_SUCCESS(muDV->GetForceCharacterSet (&forceCharset), NS_ERROR_FAILURE); + NS_ENSURE_SUCCESS(muDV->GetDefaultCharacterSet(getter_Copies(defaultCharset)), + NS_ERROR_FAILURE); + NS_ENSURE_SUCCESS(muDV->GetForceCharacterSet(getter_Copies(forceCharset)), + NS_ERROR_FAILURE); } nsCOMPtr childCV; NS_ENSURE_SUCCESS(childAsDocShell->GetContentViewer(getter_AddRefs(childCV)),