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

partial fix for bug 12345 - unable to forward message; check for valid url before calling msg_pick_real_name() to prevent crashing; r=rhp, a=chofmann

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@52781 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jefft%netscape.com 1999-11-04 06:25:36 +00:00
parent 7670b1d344
commit 7ff57f52b5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/mailnews/compose/src/nsMsgSend.cpp
View File

@ -1503,7 +1503,8 @@ PRUint32 i;
PR_FREEIF(m_attachments[i].m_encoding);
m_attachments[i].m_encoding = PL_strdup ("7bit");
msg_pick_real_name(&m_attachments[i], mCompFields->GetCharacterSet());
if (m_attachments[i].mURL)
msg_pick_real_name(&m_attachments[i], mCompFields->GetCharacterSet());
//
// Next, generate a content id for use with this part
@ -1684,9 +1685,10 @@ nsMsgComposeAndSend::AddCompFieldLocalAttachments()
if (m_attachments[newLoc].mFileSpec)
delete (m_attachments[newLoc].mFileSpec);
m_attachments[newLoc].mFileSpec = new nsFileSpec( nsFileURL((const char *) str) );
m_attachments[newLoc].mFileSpec = new nsFileSpec( nsFileURL((const char *) str) );
msg_pick_real_name(&m_attachments[newLoc], mCompFields->GetCharacterSet());
if (m_attachments[newLoc].mURL)
msg_pick_real_name(&m_attachments[newLoc], mCompFields->GetCharacterSet());
// Now, most importantly, we need to figure out what the content type is for
// this attachment...If we can't, then just make it application/octet-stream
@ -1961,7 +1963,8 @@ nsMsgComposeAndSend::HackAttachments(const nsMsgAttachmentData *attachments,
PL_strcasecmp (m_attachments[i].m_encoding, ENCODING_BINARY))
m_attachments[i].m_already_encoded_p = PR_TRUE;
msg_pick_real_name(&m_attachments[i], mCompFields->GetCharacterSet());
if (m_attachments[i].mURL)
msg_pick_real_name(&m_attachments[i], mCompFields->GetCharacterSet());
}
}
@ -2042,7 +2045,8 @@ nsMsgComposeAndSend::HackAttachments(const nsMsgAttachmentData *attachments,
PL_strncasecmp(turl, "snews:",6))
news_count++;
msg_pick_real_name(&m_attachments[i], mCompFields->GetCharacterSet());
if (m_attachments[i].mURL)
msg_pick_real_name(&m_attachments[i], mCompFields->GetCharacterSet());
}
}
}