diff --git a/mozilla/htmlparser/src/CRtfDTD.cpp b/mozilla/htmlparser/src/CRtfDTD.cpp
index 1989a315b20..363194a1d31 100644
--- a/mozilla/htmlparser/src/CRtfDTD.cpp
+++ b/mozilla/htmlparser/src/CRtfDTD.cpp
@@ -935,7 +935,7 @@ nsresult CRTFControlWord::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aM
  * @param   
  * @return  nsresult
  */
-CRTFContent::CRTFContent(PRUnichar* aKey) : CToken(aKey) {
+CRTFContent::CRTFContent(PRUnichar* aKey) : CToken(nsAutoString(aKey)) {
 }
 
 
diff --git a/mozilla/htmlparser/src/nsExpatTokenizer.cpp b/mozilla/htmlparser/src/nsExpatTokenizer.cpp
index b33f0d73cd6..85b829f0392 100644
--- a/mozilla/htmlparser/src/nsExpatTokenizer.cpp
+++ b/mozilla/htmlparser/src/nsExpatTokenizer.cpp
@@ -812,8 +812,8 @@ int nsExpatTokenizer::HandleExternalEntityRef(XML_Parser parser,
 #ifdef XML_DTD
   // Load the external entity into a buffer
   nsCOMPtr<nsIInputStream> in = nsnull;
-  nsAutoString urlSpec = (const PRUnichar*) systemId;
-  nsAutoString baseURL = (const PRUnichar*) base;
+  nsAutoString urlSpec( (const PRUnichar*) systemId );
+  nsAutoString baseURL( (const PRUnichar*) base );
   nsAutoString absURL;
 
   nsresult rv = OpenInputStream(urlSpec, baseURL, getter_AddRefs(in), &absURL);
diff --git a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp
index b1ce5c254f3..83fdf565a8c 100644
--- a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp
+++ b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp
@@ -1486,7 +1486,7 @@ nsHTMLToTXTSinkStream::Write(const nsString& aString)
         // Note that we are in whitespace.
         mInWhitespace = PR_TRUE;
         if(!mCacheLine) {
-          nsAutoString whitestring=aString[nextpos];
+          nsAutoString whitestring(aString[nextpos]);
           WriteSimple(whitestring);
         } else {
           offsetIntoBuffer = aString.GetUnicode();
diff --git a/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp b/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp
index a504307e0e3..59d21107185 100644
--- a/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp
+++ b/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp
@@ -240,7 +240,7 @@ nsresult nsDateTimeFormatMac::Initialize(nsILocale* locale)
   else {
     res = locale->GetCategory(aCategory.GetUnicode(), &aLocaleUnichar);
     if (NS_SUCCEEDED(res) && NULL != aLocaleUnichar) {
-      if (mLocale.Length() && mLocale.EqualsIgnoreCase(aLocaleUnichar)) {
+      if (mLocale.Length() && mLocale.EqualsIgnoreCase(nsAutoString(aLocaleUnichar))) {
         nsMemory::Free(aLocaleUnichar);
         return NS_OK;
       }
diff --git a/mozilla/intl/strres/src/nsStringBundle.cpp b/mozilla/intl/strres/src/nsStringBundle.cpp
index 5ed3546cb16..72a7d5a767a 100644
--- a/mozilla/intl/strres/src/nsStringBundle.cpp
+++ b/mozilla/intl/strres/src/nsStringBundle.cpp
@@ -183,7 +183,7 @@ nsStringBundle::FormatStringFromName(const PRUnichar *aName,
 {
   nsresult rv;
   nsAutoString formatStr;
-  rv = GetStringFromName(aName, formatStr);
+  rv = GetStringFromName(nsAutoString(aName), formatStr);
   if (NS_FAILED(rv)) return rv;
 
   return FormatString(formatStr.GetUnicode(), aParams, aLength, aResult);
diff --git a/mozilla/parser/htmlparser/src/CRtfDTD.cpp b/mozilla/parser/htmlparser/src/CRtfDTD.cpp
index 1989a315b20..363194a1d31 100644
--- a/mozilla/parser/htmlparser/src/CRtfDTD.cpp
+++ b/mozilla/parser/htmlparser/src/CRtfDTD.cpp
@@ -935,7 +935,7 @@ nsresult CRTFControlWord::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aM
  * @param   
  * @return  nsresult
  */
-CRTFContent::CRTFContent(PRUnichar* aKey) : CToken(aKey) {
+CRTFContent::CRTFContent(PRUnichar* aKey) : CToken(nsAutoString(aKey)) {
 }
 
 
diff --git a/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp b/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp
index b33f0d73cd6..85b829f0392 100644
--- a/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp
+++ b/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp
@@ -812,8 +812,8 @@ int nsExpatTokenizer::HandleExternalEntityRef(XML_Parser parser,
 #ifdef XML_DTD
   // Load the external entity into a buffer
   nsCOMPtr<nsIInputStream> in = nsnull;
-  nsAutoString urlSpec = (const PRUnichar*) systemId;
-  nsAutoString baseURL = (const PRUnichar*) base;
+  nsAutoString urlSpec( (const PRUnichar*) systemId );
+  nsAutoString baseURL( (const PRUnichar*) base );
   nsAutoString absURL;
 
   nsresult rv = OpenInputStream(urlSpec, baseURL, getter_AddRefs(in), &absURL);
diff --git a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
index b1ce5c254f3..83fdf565a8c 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
@@ -1486,7 +1486,7 @@ nsHTMLToTXTSinkStream::Write(const nsString& aString)
         // Note that we are in whitespace.
         mInWhitespace = PR_TRUE;
         if(!mCacheLine) {
-          nsAutoString whitestring=aString[nextpos];
+          nsAutoString whitestring(aString[nextpos]);
           WriteSimple(whitestring);
         } else {
           offsetIntoBuffer = aString.GetUnicode();