Avoid crashes with nested multipart/mixed parts.

diff --git a/Lib/mimify.py b/Lib/mimify.py
index ce4c4baebf3091ba5201c6ccd35ede2ac4470ac3..15f0981749795cdcdd4ca19b36a42615cf97f577 100755 (executable)
--- a/Lib/mimify.py
+++ b/Lib/mimify.py
@@ -367,7 +367,14 @@ def mimify_part(ifile, ofile, is_mime):
        line = message_end
        while multipart:
                if line == multipart + '--\n':
-                       return
+                       # read bit after the end of the last part
+                       while 1:
+                               line = ifile.readline()
+                               if not line:
+                                       return
+                               if must_quote_body:
+                                       line = mime_encode(line, 0)
+                               ofile.write(line)
                if line == multipart + '\n':
                        nifile = File(ifile, multipart)
                        mimify_part(nifile, ofile, 1)