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

Bug 365751: Fix for O(N^2) perf handling attachments with '\n' and other clean up for nsMsgLocalMailFolder::CopyData, r+sr=bienvenu.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@218371 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ajschult%verizon.net
2007-01-14 21:20:40 +00:00
parent a66f49714f
commit 145e143b75
1 changed files with 37 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
mozilla/mailnews/local/src/nsLocalMailFolder.cpp
View File

@@ -2413,72 +2413,57 @@ NS_IMETHODIMP nsMsgLocalMailFolder::CopyData(nsIInputStream *aIStream, PRInt32 a
return NS_ERROR_OUT_OF_MEMORY;
PRUint32 readCount;
if ( aLength + mCopyState->m_leftOver > mCopyState->m_dataBufferSize )
//allocate one extra byte for '\0' at the end and another extra byte at the
//front to insert a '>' if we have a "From" line
if ( aLength + mCopyState->m_leftOver + 2 > mCopyState->m_dataBufferSize )
{
mCopyState->m_dataBuffer = (char *) PR_REALLOC(mCopyState->m_dataBuffer, aLength + mCopyState->m_leftOver+ 1);
if (!mCopyState->m_dataBuffer)
char *newBuffer = (char *) PR_REALLOC(mCopyState->m_dataBuffer, aLength + mCopyState->m_leftOver + 2);
if (!newBuffer)
return NS_ERROR_OUT_OF_MEMORY;
mCopyState->m_dataBufferSize = aLength + mCopyState->m_leftOver;
mCopyState->m_dataBuffer = newBuffer;
mCopyState->m_dataBufferSize = aLength + mCopyState->m_leftOver + 1;
}
mCopyState->m_fileStream->seek(PR_SEEK_END, 0);
char *start, *end;
PRUint32 linebreak_len = 0;
rv = aIStream->Read(mCopyState->m_dataBuffer + mCopyState->m_leftOver,
rv = aIStream->Read(mCopyState->m_dataBuffer + mCopyState->m_leftOver + 1,
aLength, &readCount);
NS_ENSURE_SUCCESS(rv, rv);
mCopyState->m_leftOver += readCount;
mCopyState->m_dataBuffer[mCopyState->m_leftOver] ='\0';
start = mCopyState->m_dataBuffer;
end = (char *) memchr(start, '\r', mCopyState->m_leftOver);
if (!end)
end = (char *) memchr(start, '\n', mCopyState->m_leftOver);
else if (*(end+1) == nsCRT::LF && linebreak_len == 0)
linebreak_len = 2;
if (linebreak_len == 0) // not set yet
linebreak_len = 1;
nsCString line;
char tmpChar = 0;
mCopyState->m_dataBuffer[mCopyState->m_leftOver + 1] ='\0';
char *start = mCopyState->m_dataBuffer + 1;
char *endBuffer = mCopyState->m_dataBuffer + mCopyState->m_leftOver + 1;
PRInt32 lineLength, bytesWritten;
while (start && end)
while (1)
{
if (mCopyState->m_fromLineSeen)
char *end = PL_strnpbrk(start, "\r\n", endBuffer - start);
if (!end)
{
if (strncmp(start, "From ", 5) == 0)
{
line = ">";
tmpChar = *end;
*end = 0;
line += start;
*end = tmpChar;
line += MSG_LINEBREAK;
lineLength = line.Length();
bytesWritten = mCopyState->m_fileStream->write(line.get(), lineLength);
if (bytesWritten != lineLength)
{
ThrowAlertMsg("copyMsgWriteFailed", mCopyState->m_msgWindow);
mCopyState->m_writeFailed = PR_TRUE;
return NS_MSG_ERROR_WRITING_MAIL_FOLDER;
}
if (mCopyState->m_parseMsgState)
mCopyState->m_parseMsgState->ParseAFolderLine(line.get(),
line.Length());
goto keepGoing;
}
mCopyState->m_leftOver -= (start - mCopyState->m_dataBuffer - 1);
memmove (mCopyState->m_dataBuffer + 1, start, mCopyState->m_leftOver);
break;
}
else
//need to set the linebreak_len each time
PRUint32 linebreak_len = 1; //assume CR or LF
if (*end == nsCRT::CR && *(end+1) == nsCRT::LF)
linebreak_len = 2; //CRLF
if (!mCopyState->m_fromLineSeen)
{
mCopyState->m_fromLineSeen = PR_TRUE;
NS_ASSERTION(strncmp(start, "From ", 5) == 0,
"Fatal ... bad message format\n");
}
else if (strncmp(start, "From ", 5) == 0)
{
//if we're at the beginning of the buffer, we've reserved a byte to
//insert a '>'. If we're in the middle, we're overwriting the previous
//line ending, but we've already written it to m_fileStream, so it's OK.
*--start = '>';
}
lineLength = end-start+linebreak_len;
bytesWritten = mCopyState->m_fileStream->write(start, lineLength);
@@ -2490,39 +2475,14 @@ NS_IMETHODIMP nsMsgLocalMailFolder::CopyData(nsIInputStream *aIStream, PRInt32 a
}
if (mCopyState->m_parseMsgState)
mCopyState->m_parseMsgState->ParseAFolderLine(start,
end-start+linebreak_len);
keepGoing:
start = end+linebreak_len;
if (start >=
&mCopyState->m_dataBuffer[mCopyState->m_leftOver])
mCopyState->m_parseMsgState->ParseAFolderLine(start, lineLength);
start = end + linebreak_len;
if (start >= endBuffer)
{
mCopyState->m_leftOver = 0;
break;
}
char *endBuffer = mCopyState->m_dataBuffer + mCopyState->m_leftOver;
end = (char *) memchr(start, '\r', endBuffer - start + 1);
if (end)
{
if (*(end+1) == nsCRT::LF) //need to set the linebreak_len each time
linebreak_len = 2; //CRLF
else
linebreak_len = 1; //only CR
}
if (!end)
{
end = (char *) memchr(start, '\n', endBuffer - start + 1);
if (end)
linebreak_len = 1; //LF
else
linebreak_len =0; //no LF
}
if (start && !end)
{
mCopyState->m_leftOver -= (start - mCopyState->m_dataBuffer);
memcpy (mCopyState->m_dataBuffer, start,
mCopyState->m_leftOver+1);
}
}
return rv;
}