Bug 1026989 - only use charset from body part (patch from bug 715823). r=jorgk a=jorgk
authorPhilippe Martinak <philippe.martinak@i-carre.net>
Sat, 10 Dec 2016 14:15:54 +0100
changeset 27676 ce9f495086613f7e8929fabdbe91722271bf312c
parent 27675 62c75cca01eb04c698cec4ee512316f316d3b0c4
child 27677 f0f54f3a962dd7b59cc5dcecf63e4a1abca86424
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk, jorgk
bugs1026989, 715823
Bug 1026989 - only use charset from body part (patch from bug 715823). r=jorgk a=jorgk
mailnews/mime/src/mimemoz2.cpp
--- a/mailnews/mime/src/mimemoz2.cpp
+++ b/mailnews/mime/src/mimemoz2.cpp
@@ -1300,17 +1300,17 @@ bool MimeObjectIsMessageBodyNoClimb(Mime
   MimeContainer *container = (MimeContainer *)parent;
   int32_t i;
   char *disp;
 
   NS_ASSERTION(stop, "NULL stop to MimeObjectIsMessageBodyNoClimb");
 
   for (i = 0; i < container->nchildren; i++) {
     MimeObject *child = container->children[i];
-    bool is_body = false;
+    bool is_body = true;
 
     // The body can't be something we're not displaying.
     if (! child->output_p)
       is_body = false;
     else if ((disp = MimeHeaders_get (child->headers, HEADER_CONTENT_DISPOSITION,
                                       true, false))) {
       PR_Free(disp);
       is_body = false;