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

87110 - Avoid memory bloat by moving Malloc out of do-while. Also do not propagate error messages

Browse Source 
from unicode coverter. r=ftang, sr=vidur.
89732 - Stop searching for words if mOffset is negative. r=jst sr=vidur


git-svn-id: svn://10.0.0.236/trunk@99195 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
harishd%netscape.com
2001-07-13 18:21:23 +00:00
parent 91bbd7d16d
commit 58688829ca
4 changed files with 82 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/parser/htmlparser/src/nsParser.cpp
View File

@@ -645,6 +645,10 @@ public:
//********************************************************************************
PRInt32 GetNextWord(PRBool aSkipQuotes=PR_FALSE) {
if(mOffset == kNotFound) {
return kNotFound; // Ref. bug 89732
}
const CharT *cp=mBuffer+mOffset+mLength; //skip last word

64
mozilla/parser/htmlparser/src/nsScanner.cpp
View File

@@ -293,41 +293,51 @@ nsresult nsScanner::Append(const nsAReadableString& aBuffer) {
*/
nsresult nsScanner::Append(const char* aBuffer, PRUint32 aLen){
nsresult res=NS_OK;
PRUnichar* unichars;
PRUnichar *unichars, *start;
if(mUnicodeDecoder) {
do {
PRInt32 unicharBufLen = 0;
mUnicodeDecoder->GetMaxLength(aBuffer, aLen, &unicharBufLen);
unichars = (PRUnichar*)nsMemory::Alloc((unicharBufLen+1) * sizeof(PRUnichar));
if (!unichars) {
return PR_FALSE;
}
PRInt32 srcLength = aLen;
PRInt32 unicharLength = unicharBufLen;
PRInt32 unicharBufLen = 0;
mUnicodeDecoder->GetMaxLength(aBuffer, aLen, &unicharBufLen);
start = unichars = (PRUnichar*)nsMemory::Alloc((unicharBufLen+1) * sizeof(PRUnichar));
NS_ENSURE_TRUE(unichars,NS_ERROR_OUT_OF_MEMORY);
PRInt32 totalChars = 0;
PRInt32 unicharLength = unicharBufLen;
do {
PRInt32 srcLength = aLen;
res = mUnicodeDecoder->Convert(aBuffer, &srcLength, unichars, &unicharLength);
// if we failed, we consume one byte, replace it with U+FFFD
// and try the conversion again.
if(NS_FAILED(res)) {
unichars[unicharLength++] = (PRUnichar)0xFFFD;
}
AppendToBuffer(unichars, unichars+unicharLength,
unichars+unicharBufLen);
mTotalRead += unicharLength;
totalChars += unicharLength;
// Continuation of failure case
if(NS_FAILED(res)) {
// if we failed, we consume one byte, replace it with U+FFFD
// and try the conversion again.
unichars[unicharLength++] = (PRUnichar)0xFFFD;
unichars = unichars + unicharLength;
unicharLength = unicharBufLen - (++totalChars);
mUnicodeDecoder->Reset();
if(((PRUint32) (srcLength + 1)) > aLen)
srcLength = aLen;
else
srcLength++;
aBuffer += srcLength;
aLen -= srcLength;
if(((PRUint32) (srcLength + 1)) > aLen) {
srcLength = aLen;
}
else {
srcLength++;
}
aBuffer += srcLength;
aLen -= srcLength;
}
} while (NS_FAILED(res) && (aLen > 0));
AppendToBuffer(start,
start+totalChars,
start+unicharBufLen);
mTotalRead += totalChars;
// Don't propagate return code of unicode decoder
// since it doesn't reflect on our success or failure
// - Ref. bug 87110
res = NS_OK;
}
else {
nsDependentCString str(aBuffer, aLen);