From 39e0d8adaebcdedf72eec275c7eb4a988065fd47 Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org"
 <dbaron%dbaron.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 11 Feb 2003 20:28:44 +0000
Subject: [PATCH] Fix hang when saving pages with non-ASCII characters in URLs.
  b=191965  r=adamlock  sr=bzbarsky  a=asa

git-svn-id: svn://10.0.0.236/trunk@137679 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../components/webbrowserpersist/src/nsWebBrowserPersist.cpp  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
index ee354d5643b..7dc7137b744 100644
--- a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
+++ b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
@@ -2865,7 +2865,7 @@ nsWebBrowserPersist::StoreURIAttribute(
         attrNode->GetNodeValue(oldValue);
         if (!oldValue.IsEmpty())
         {
-            nsCAutoString oldCValue; oldCValue.AssignWithConversion(oldValue);
+            NS_ConvertUCS2toUTF8 oldCValue(oldValue);
             return StoreURI(oldCValue.get(), aNeedsPersisting, aData);
         }
     }
@@ -2995,7 +2995,7 @@ nsWebBrowserPersist::FixupAnchor(nsIDOMNode *aNode)
     {
         nsString oldValue;
         attrNode->GetNodeValue(oldValue);
-        nsCString oldCValue; oldCValue.AssignWithConversion(oldValue);
+        NS_ConvertUCS2toUTF8 oldCValue(oldValue);
 
         // Skip empty values and self-referencing bookmarks
         if (oldCValue.IsEmpty() || oldCValue.CharAt(0) == '#')