From a0be83af6471a691b43599d6cd1f9accf5b72b31 Mon Sep 17 00:00:00 2001 From: "tbogard%aol.net" Date: Wed, 8 Dec 1999 05:00:51 +0000 Subject: [PATCH] Fix for 21113. git-svn-id: svn://10.0.0.236/trunk@55725 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 10 ++++++---- mozilla/webshell/src/nsWebShell.cpp | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 52654866d9b..92a2cfcd440 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -4544,15 +4544,17 @@ NS_IMETHODIMP nsWebShell::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)), diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 52654866d9b..92a2cfcd440 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -4544,15 +4544,17 @@ NS_IMETHODIMP nsWebShell::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)),