From e6fbcc6cedc593f2f06595fc6b83d3e55d47d4d3 Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com"
 <alecf%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 11 Jan 2002 22:40:09 +0000
Subject: [PATCH] progress towards 108962 - fix nsLinebreakConverter to stop
 using private nsStr members r=dbaron, sr=jag

git-svn-id: svn://10.0.0.236/trunk@111970 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpcom/io/nsLinebreakConverter.cpp | 48 ++++++-----------------
 1 file changed, 13 insertions(+), 35 deletions(-)

diff --git a/mozilla/xpcom/io/nsLinebreakConverter.cpp b/mozilla/xpcom/io/nsLinebreakConverter.cpp
index 50bcaff991d..0779ec37224 100644
--- a/mozilla/xpcom/io/nsLinebreakConverter.cpp
+++ b/mozilla/xpcom/io/nsLinebreakConverter.cpp
@@ -471,44 +471,22 @@ nsresult nsLinebreakConverter::ConvertStringLineBreaks(nsString& ioString,
   // nothing to do
   if (ioString.Length() == 0) return NS_OK;
   
-  // we can't go messing with data we don't own
-  if (!ioString.mOwnsBuffer) return NS_ERROR_UNEXPECTED;
-  
   nsresult rv;
   
-  if (ioString.mCharSize == eTwoByte)
-  {
-    PRUnichar  *stringBuf = ioString.mUStr;
-    PRInt32    newLen, theLen = ioString.mLength + 1;
+  // remember the old buffer in case
+  // we blow it away later
+  nsString::char_iterator stringBuf;
+  ioString.BeginWriting(stringBuf);
+  
+  PRInt32    newLen;
     
-    rv = ConvertUnicharLineBreaksInSitu(&stringBuf, aSrcBreaks, aDestBreaks, theLen, &newLen);
-    if (NS_FAILED(rv)) return rv;
-    
-    if (stringBuf != ioString.mUStr)  // we reallocated
-    {
-      // this is pretty evil. Is there a better way?
-      nsMemory::Free(ioString.mUStr);
-      ioString.mUStr = stringBuf;
-      ioString.mLength = newLen - 1;
-      ioString.mCapacity = newLen;
-    }
-  }
-  else
-  {
-    char     *stringBuf = ioString.mStr;
-    PRInt32  newLen, theLen = ioString.mLength + 1;
-    
-    rv = ConvertLineBreaksInSitu(&stringBuf, aSrcBreaks, aDestBreaks, theLen, &newLen);
-    if (NS_FAILED(rv)) return rv;
-    
-    if (stringBuf != ioString.mStr)  // we reallocated
-    {
-      nsMemory::Free(ioString.mStr);
-      ioString.mStr = stringBuf;
-      ioString.mLength = newLen - 1;
-      ioString.mCapacity = newLen;
-    }
-  }
+  rv = ConvertUnicharLineBreaksInSitu(&stringBuf,
+                                      aSrcBreaks, aDestBreaks,
+                                      ioString.Length() + 1, &newLen);
+  if (NS_FAILED(rv)) return rv;
+
+  if (stringBuf != ioString.get())
+    ioString.Adopt(stringBuf);
   
   return NS_OK;
 }