#57125 importing from eudora or outlook can crash.

#59084 can't copy imported mail messages because they have bad message envelopes.
fixed by cavin@netscape.com, r=sspitzer, sr=bienvenu
This commit is contained in:
sspitzer%netscape.com 2001-04-26 05:48:38 +00:00
Родитель 02eecc1fb1
Коммит d5c2359627
6 изменённых файлов: 6 добавлений и 10 удалений

Просмотреть файл

@ -790,8 +790,6 @@ PRBool SimpleBuffer::SpecialMemCpy( PRInt32 offset, const char *pData, PRInt32 l
len--;
}
m_pBuffer[offset] = *pData;
return( PR_TRUE);
}

Просмотреть файл

@ -31,7 +31,7 @@
#define kWhitespace " \t\b\r\n"
const char *eudoraFromLine = "From ????@???? 1 Jan 1965 00:00:00\x0D\x0A";
const char *eudoraFromLine = "From - Mon Jan 1 00:00:00 1965\x0D\x0A";
#ifdef IMPORT_DEBUG
void DUMP_FILENAME( nsIFileSpec *pSpec, PRBool endLine);

Просмотреть файл

@ -219,7 +219,7 @@ PRBool nsOE5File::IsFromLine( char *pLine, PRUint32 len)
// Anything over 16K will be assumed BAD, BAD, BAD!
#define kMailboxBufferSize 0x4000
const char *nsOE5File::m_pFromLineSep = "From ????@???? 1 Jan 1965 00:00:00\x0D\x0A";
const char *nsOE5File::m_pFromLineSep = "From - Jan 1965 00:00:00\x0D\x0A";
nsresult nsOE5File::ImportMailbox( PRUint32 *pBytesDone, PRBool *pAbort, nsString& name, nsIFileSpec *inFile, nsIFileSpec *pDestination, PRUint32 *pCount)
{

Просмотреть файл

@ -180,7 +180,7 @@ PRBool CImportMailbox::GetIndexFile( nsIFileSpec* file)
}
const char *CMbxScanner::m_pFromLine = "From ????@???? 1 Jan 1965 00:00:00\x0D\x0A";
const char *CMbxScanner::m_pFromLine = "From - Jan 1965 00:00:00\x0D\x0A";
// let's try a 16K buffer and see how well that works?
#define kBufferKB 16

Просмотреть файл

@ -34,13 +34,13 @@
extern LPMAPIALLOCATEBUFFER gpMapiAllocateBuffer;
extern LPMAPIFREEBUFFER gpMapiFreeBuffer;
// Sample From line: From ????@???? 1 Jan 1965 00:00:00
// Sample From line: From - 1 Jan 1965 00:00:00
typedef const char * PC_S8;
static const char * kWhitespace = "\b\t\r\n ";
static const char * sFromLine = "From ????@???? ";
static const char * sFromDate = "1 Jan 1965 00:00:00";
static const char * sFromLine = "From - ";
static const char * sFromDate = "Mon Jan 1 00:00:00 1965";
static const char * sDaysOfWeek[7] = {
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
};

Просмотреть файл

@ -722,8 +722,6 @@ PRBool SimpleBuffer::SpecialMemCpy( PRInt32 offset, const char *pData, PRInt32 l
len--;
}
m_pBuffer[offset] = *pData;
return( PR_TRUE);
}