X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=mime-node.c;h=7c8b26024460346ff3387df68234dddfd1256a36;hp=c3d5cb9b47595ad2a43606e8faf08b8a0e28283d;hb=9beda4b9811323d1fd9eb120d6e7a2ef69beed14;hpb=a18bbf7f155369f251b0513788eade23be3555d5

diff --git a/mime-node.c b/mime-node.c
index c3d5cb9b..7c8b2602 100644
--- a/mime-node.c
+++ b/mime-node.c
@@ -214,13 +214,15 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
     node->decrypt_success = true;
     node->verify_attempted = true;
 
-    /* This may be NULL if the part is not signed. */
-    node->sig_list = g_mime_decrypt_result_get_signatures (decrypt_result);
-    if (node->sig_list) {
-	g_object_ref (node->sig_list);
-	set_signature_list_destructor (node);
+    if (decrypt_result) {
+	/* This may be NULL if the part is not signed. */
+	node->sig_list = g_mime_decrypt_result_get_signatures (decrypt_result);
+	if (node->sig_list) {
+	    g_object_ref (node->sig_list);
+	    set_signature_list_destructor (node);
+	}
+	g_object_unref (decrypt_result);
     }
-    g_object_unref (decrypt_result);
 
  DONE:
     if (err)
@@ -276,7 +278,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
 	    fprintf (stderr, "Warning: %s (%s).\n", notmuch_status_to_string (status),
 		     protocol ? protocol : "NULL");
 	if (!cryptoctx)
-	    return NULL;
+	    return node;
     }
 #endif