Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for incorrect reporting of number of attachments for signed messages - Bug #: 23182 - r: jefft

Browse Source
This commit is contained in:
rhp%netscape.com 2000-01-06 19:59:48 +00:00
parent 5e0e088a7e
commit c0162b5a15
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp
View File

@ -353,6 +353,7 @@ nsMimeHtmlDisplayEmitter::AddAttachmentField(const char *field, const char *valu
nsresult
nsMimeHtmlDisplayEmitter::EndAttachment()
{
mSkipAttachment = PR_FALSE;
if (BroadCastHeadersAndAttachments())
return NS_OK;

54
mailnews/mime/src/mimemoz2.cpp
View File

@ -237,6 +237,9 @@ MimeGetAttachmentList(MimeObject *tobj, const char *aMessageURL, nsMsgAttachment
char *part = mime_part_address(child);
char *imappart = NULL;
MimeContainer *tempObj = (MimeContainer *)child;
printf("Children = %d\n", tempObj->nchildren);
if (!part)
return NS_ERROR_OUT_OF_MEMORY;
@ -353,13 +356,20 @@ NotifyEmittersOfAttachmentList(MimeDisplayOptions *opt,
PRInt32 i = 0;
struct nsMsgAttachmentData *tmp = data;
if ( (!tmp) || (!tmp->real_name) )
if (!tmp)
return;
while ( (tmp) && (tmp->real_name) )
while (tmp->url)
{
char *spec;
if (!tmp->real_name)
{
++i;
++tmp;
continue;
}
spec = nsnull;
if ( tmp->url )
tmp->url->GetSpec(&spec);
@ -908,33 +918,37 @@ mime_find_text_html_part_1(MimeObject* obj)
return NULL;
}
/* Finds the main object of the message -- generally a multipart/mixed,
text/plain, or text/html. */
MimeObject*
mime_get_main_object(MimeObject* obj)
{
MimeContainer* cobj;
if (!(mime_subclass_p(obj->clazz, (MimeObjectClass*) &mimeMessageClass))) {
MimeContainer *cobj;
if (!(mime_subclass_p(obj->clazz, (MimeObjectClass*) &mimeMessageClass)))
{
return obj;
}
cobj = (MimeContainer*) obj;
if (cobj->nchildren != 1) return obj;
obj = cobj->children[0];
for (;;) {
#ifdef MOZ_SECURITY
HG99001
#else
if (!mime_subclass_p(obj->clazz,
(MimeObjectClass*) &mimeMultipartSignedClass)) {
#endif /* MOZ_SECURITY */
return obj;
while (obj)
{
if ( (!mime_subclass_p(obj->clazz,
(MimeObjectClass*) &mimeMultipartSignedClass)) &&
(PL_strcasecmp(obj->content_type, MULTIPART_SIGNED) != 0)
)
{
return obj;
}
else
{
// We don't care about a signed/smime object; Go inside to the
// thing that we signed or smime'ed
//
cobj = (MimeContainer*) obj;
if (cobj->nchildren > 0)
obj = cobj->children[0];
else
obj = nsnull;
}
/* Our main thing is a signed or xlated object.
We don't care about that; go on inside to the thing that we signed or
xlated. */
cobj = (MimeContainer*) obj;
if (cobj->nchildren != 1) return obj;
obj = cobj->children[0];
}
return NULL;
}