From 1cc47908f928359145badddbdbf154d741829965 Mon Sep 17 00:00:00 2001 From: Kornilios Kourtis Date: Tue, 28 Jul 2009 19:58:23 +0300 Subject: [PATCH] handle malformed multiplart messages --- lib/sup/message.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/sup/message.rb b/lib/sup/message.rb index 426eb80..39862b9 100644 --- a/lib/sup/message.rb +++ b/lib/sup/message.rb @@ -409,11 +409,15 @@ private chunks elsif m.header.content_type == "message/rfc822" - payload = RMail::Parser.read(m.body) - from = payload.header.from.first - from_person = from ? Person.from_address(from.format) : nil - [Chunk::EnclosedMessage.new(from_person, payload.to_s)] + - message_to_chunks(payload, encrypted) + if m.body + payload = RMail::Parser.read(m.body) + from = payload.header.from.first + from_person = from ? Person.from_address(from.format) : nil + [Chunk::EnclosedMessage.new(from_person, payload.to_s)] + + message_to_chunks(payload, encrypted) + else + [Chunk::EnclosedMessage.new(nil, "")] + end else filename = ## first, paw through the headers looking for a filename -- 2.43.0