wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 254298 - nsPlainTextSerializer.cpp should not use AssignWithConversion. r=smaug

Browse Source
This commit is contained in:
Makoto Kato 2011-11-04 17:44:13 +09:00
parent afd56ab0f4
commit 8d98c52488
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
content/base/src/nsPlainTextSerializer.cpp
View File

@ -307,8 +307,6 @@ nsPlainTextSerializer::AppendText(nsIContent* aText,
NS_ENSURE_ARG(aText);
nsresult rv = NS_OK;
PRInt32 length = 0;
nsAutoString textstr;
nsIContent* content = aText;
const nsTextFragment* frag;
@ -319,16 +317,19 @@ nsPlainTextSerializer::AppendText(nsIContent* aText,
PRInt32 endoffset = (aEndOffset == -1) ? frag->GetLength() : aEndOffset;
NS_ASSERTION(aStartOffset <= endoffset, "A start offset is beyond the end of the text fragment!");
length = endoffset - aStartOffset;
PRInt32 length = endoffset - aStartOffset;
if (length <= 0) {
return NS_OK;
}
nsAutoString textstr;
if (frag->Is2b()) {
textstr.Assign(frag->Get2b() + aStartOffset, length);
}
else {
textstr.AssignWithConversion(frag->Get1b()+aStartOffset, length);
// AssignASCII is for 7-bit character only, so don't use it
const char *data = frag->Get1b();
CopyASCIItoUTF16(Substring(data + aStartOffset, data + endoffset), textstr);
}
mOutputString = &aStr;