Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 132583: deal more cleanly with passing non-UTF8 strings to NS_ConvertUTF8toUCS2. r=scc, sr=darin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@121461 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jaggernaut%netscape.com
2002-05-14 08:27:57 +00:00
parent 064bc1b93d
commit 03072ae01d
4 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/xpcom/string/obsolete/nsString2.cpp
View File

@@ -1330,22 +1330,20 @@ NS_ConvertUTF8toUCS2::Init( const nsACString& aCString )
PRUint32 count = calculator.Length();
if (count) {
// Grow the buffer if we need to.
SetCapacity(count);
// |SetCapacity| normally doesn't guarantee the use we are putting it to here (see its interface comment in nsAString.h),
// we can only use it since our local implementation, |nsString::SetCapacity|, is known to do what we want
SetLength(count);
// All ready? Time to convert
ConvertUTF8toUCS2 converter(mUStr);
copy_string(aCString.BeginReading(start), aCString.EndReading(end), converter);
mLength = converter.Length();
if (GetCapacity())
mUStr[mLength] = '\0'; // null terminate
if (mLength != count) {
NS_ERROR("Input wasn't UTF8 or incorrect length was calculated");
Truncate();
}
}
NS_ASSERTION(count == mLength, "calculator calculated incorrect length");
}
/**