[Project] Fix some final issues

diff --git a/src/libmime/message.c b/src/libmime/message.c
index a725d7e89608747400e93f2be235e19ebfa2ad07..fb488b71bfaa818f8a49e707f26f147c7fdfb3ad 100644 (file)
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -1140,11 +1140,16 @@ rspamd_message_new (struct rspamd_task *task)
        msg = rspamd_mempool_alloc0 (task->task_pool, sizeof (*msg));
 
        msg->raw_headers = rspamd_message_headers_new ();
+
        msg->emails = g_hash_table_new (rspamd_email_hash, rspamd_emails_cmp);
        msg->urls = g_hash_table_new (rspamd_url_hash, rspamd_urls_cmp);
+
        msg->parts = g_ptr_array_sized_new (4);
        msg->text_parts = g_ptr_array_sized_new (2);
 
+       msg->from_mime = g_ptr_array_sized_new (1);
+       msg->rcpt_mime = g_ptr_array_sized_new (1);
+
        REF_INIT_RETAIN (msg, rspamd_message_dtor);
 
        return msg;

diff --git a/src/libmime/mime_headers.c b/src/libmime/mime_headers.c
index bc8ace679e24b0974c6c539ca8881c73191fcdd6..f9027b53dcbc0ef550b099a6095d1b0cf5bf6a6d 100644 (file)
--- a/src/libmime/mime_headers.c
+++ b/src/libmime/mime_headers.c
@@ -1602,13 +1602,17 @@ rspamd_message_get_header_from_hash (khash_t(rspamd_mime_headers_htb) *htb,
 {
        khiter_t k;
 
-       k = kh_get (rspamd_mime_headers_htb, htb, (gchar *)field);
+       if (htb) {
+               k = kh_get (rspamd_mime_headers_htb, htb, (gchar *) field);
 
-       if (k == kh_end (htb)) {
-               return NULL;
+               if (k == kh_end (htb)) {
+                       return NULL;
+               }
+
+               return kh_value (htb, k);
        }
 
-       return kh_value (htb, k);
+       return NULL;
 }
 
 struct rspamd_mime_header *