Commit aa382e6e authored by Guido van Rossum's avatar Guido van Rossum

Sjoerd writes: When a multipart message is incomplete, mimify crashes.

parent 833fda79
...@@ -179,6 +179,9 @@ def unmimify_part(ifile, ofile, decode_base64 = 0): ...@@ -179,6 +179,9 @@ def unmimify_part(ifile, ofile, decode_base64 = 0):
nifile = File(ifile, multipart) nifile = File(ifile, multipart)
unmimify_part(nifile, ofile, decode_base64) unmimify_part(nifile, ofile, decode_base64)
line = nifile.peek line = nifile.peek
if not line:
# premature end of file
break
continue continue
# not a boundary between parts # not a boundary between parts
break break
...@@ -390,6 +393,9 @@ def mimify_part(ifile, ofile, is_mime): ...@@ -390,6 +393,9 @@ def mimify_part(ifile, ofile, is_mime):
nifile = File(ifile, multipart) nifile = File(ifile, multipart)
mimify_part(nifile, ofile, 1) mimify_part(nifile, ofile, 1)
line = nifile.peek line = nifile.peek
if not line:
# premature end of file
break
ofile.write(line) ofile.write(line)
continue continue
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment