diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-11-11 01:56:34 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-11 01:56:34 -0500 |
| commit | 73e14fb7049306439a5637ff261f1370a94518e5 (patch) | |
| tree | f9ef6c4782b0849bae1927f2c1ab9bbd8d97aa4d /mailnews/mime/src/mimemult.cpp | |
| parent | dc77b707f20280cd057368ca11fafc2c0bfc9414 (diff) | |
| download | UXP-73e14fb7049306439a5637ff261f1370a94518e5.tar UXP-73e14fb7049306439a5637ff261f1370a94518e5.tar.gz UXP-73e14fb7049306439a5637ff261f1370a94518e5.tar.lz UXP-73e14fb7049306439a5637ff261f1370a94518e5.tar.xz UXP-73e14fb7049306439a5637ff261f1370a94518e5.zip | |
Bug 1240290
Tag #1273
Diffstat (limited to 'mailnews/mime/src/mimemult.cpp')
| -rw-r--r-- | mailnews/mime/src/mimemult.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mailnews/mime/src/mimemult.cpp b/mailnews/mime/src/mimemult.cpp index 64f292ec0..4695ba991 100644 --- a/mailnews/mime/src/mimemult.cpp +++ b/mailnews/mime/src/mimemult.cpp @@ -43,6 +43,7 @@ extern "C" MimeObjectClass mimeMultipartRelatedClass; extern "C" MimeObjectClass mimeMultipartSignedClass; extern "C" MimeObjectClass mimeInlineTextVCardClass; extern "C" MimeExternalObjectClass mimeExternalObjectClass; +extern "C" MimeSuppressedCryptoClass mimeSuppressedCryptoClass; #if defined(DEBUG) && defined(XP_UNIX) static int MimeMultipart_debug_print (MimeObject *, PRFileDesc *, int32_t); @@ -471,7 +472,9 @@ MimeMultipart_create_child(MimeObject *obj) part functions set correctly */ !mime_typep(body, (MimeObjectClass*) &mimeMultipartClass) #endif - && ! (mime_typep(body, (MimeObjectClass*)&mimeExternalObjectClass) && !strcmp(body->content_type, "text/x-vcard")) + && !((mime_typep(body, (MimeObjectClass *)&mimeExternalObjectClass) || + mime_typep(body, (MimeObjectClass *)&mimeSuppressedCryptoClass)) && + !strcmp(body->content_type, "text/x-vcard")) ) { status = obj->options->decompose_file_init_fn ( obj->options->stream_closure, mult->hdrs ); @@ -575,7 +578,9 @@ MimeMultipart_close_child(MimeObject *object) part functions set correctly */ !mime_typep(kid,(MimeObjectClass*) &mimeMultipartClass) #endif - && !(mime_typep(kid, (MimeObjectClass*)&mimeExternalObjectClass) && !strcmp(kid->content_type, "text/x-vcard")) + && !((mime_typep(kid, (MimeObjectClass *)&mimeExternalObjectClass) || + mime_typep(kid, (MimeObjectClass *)&mimeSuppressedCryptoClass)) && + !strcmp(kid->content_type, "text/x-vcard")) ) { status = object->options->decompose_file_close_fn ( object->options->stream_closure ); |