X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ddb9e8ca47b9e881df743c4f79f631bfc14ef76a..f1920d78123667716f2321d37ce37628603b2700:/uip/mhfixmsg.c

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index d5107c60..65abd513 100644
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -583,7 +583,16 @@ fix_boundary (CT *ct, int *message_mods) {
                 }
 
                 free (part_boundary);
+            } else {
+                /* Couldn't fix the boundary.  Report failure so that mhfixmsg
+                   doesn't modify the message. */
+                status = NOTOK;
             }
+        } else {
+            /* No multipart struct, even though the content type is
+               CT_MULTIPART.  Report failure so that mhfixmsg doesn't modify
+               the message. */
+            status = NOTOK;
         }
     }