From ee4be71e19096a889a5b7c1185f9dd1ef7fcd92d Mon Sep 17 00:00:00 2001
From: Sascha Rommelfangen <sascha@rommelfangen.de>
Date: Fri, 2 Jun 2017 07:32:51 +0200
Subject: [PATCH] and more fixes

---
 mail_to_misp.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mail_to_misp.py b/mail_to_misp.py
index d480071..752b488 100755
--- a/mail_to_misp.py
+++ b/mail_to_misp.py
@@ -63,7 +63,7 @@ else:
     mailcontent = sys.argv[1]
     syslog.syslog(mailcontent)
     if len(sys.argv) >= 3:
-        mail_subject = sys.argv[2]
+        mail_subject = sys.argv[2].encode("utf-8", "ignore")
 email_data = b''
 msg = email.message_from_string(mailcontent)
 if not mail_subject:
@@ -83,8 +83,10 @@ for part in msg.walk():
         part.set_charset(charset)
         syslog.syslog(str(part.get_payload(decode=True)))
         email_data += part.get_payload(decode=True)        
-print("here")
-email_subject += mail_subject
+try:
+    email_subject += mail_subject
+except Exception as e:
+    syslog.syslog(str(e))
 stdin_used = True
 #except Exception as e:
 #    if debug: