mb2q: Handle newlines in Message-Id and related headers

New lines in Message-Id headers are not handled correctly.

Strip any whitespace from the message id after retrieving it. The same
applies to References and In-Reply-To headers.

Reported-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 12 insertions, 3 deletions

diff --git a/mb2q b/mb2q
index fbffec5..cc10a1b 100755
--- a/mb2q
+++ b/mb2q
@@ -283,10 +283,19 @@ class patchmsg(object):
         # Create a filename just in case
         self.fname = self.re_tofname.sub('_', self.subject)
 
+    def build_references(msg, hdr):
+        refs = []
+        for r in msg.get(hdr, '').split():
+            refs.append(r.strip())
+        return refs
+
     def get_references(self, msg):
-        self.references = msg.get('References', '').split()
-        self.inreplyto = msg.get('In-Reply-To', '').split()
-        self.msgid = msg.get('Message-ID', None)
+        self.references = patchmsg.build_references(msg, 'References')
+        self.inreplyto = patchmsg.build_references(msg, 'In-Reply-To')
+        msgid = msg.get('Message-ID', None)
+        if msgid:
+            msgid = msgid.strip()
+        self.msgid = msgid
 
     def get_addrs(self, msg):
         self.author = decode_from(msg)