From 5756068ded5fc329f53d5d6482b4ab5c5243daec Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Thu, 30 Mar 2006 05:54:54 +0000 Subject: [PATCH] Fix crash when typing ISO-8859-1 and then non-ISO-8859-1 character, and some leaks too. r=sicking sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@193245 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsTextFragment.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mozilla/content/base/src/nsTextFragment.cpp b/mozilla/content/base/src/nsTextFragment.cpp index a5f6411fc16..ec8c5c5c4be 100644 --- a/mozilla/content/base/src/nsTextFragment.cpp +++ b/mozilla/content/base/src/nsTextFragment.cpp @@ -331,11 +331,12 @@ nsTextFragment::Append(const nsAString& aData) mState.mLength += len; mState.mIs2b = PR_TRUE; - if (!mState.mInHeap) { + if (mState.mInHeap) { nsMemory::Free(m2b); } m2b = buff; + mState.mInHeap = PR_TRUE; return; } @@ -356,6 +357,7 @@ nsTextFragment::Append(const nsAString& aData) } memcpy(buff, m1b, mState.mLength); + mState.mInHeap = PR_TRUE; } for (PRUint32 i = 0; i < len; ++i) {