From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 30 Nov 2017 08:59:26 +0000 (-0500)
Subject: mime-node: handle decrypt_result more safely
X-Git-Tag: 0.26_rc0~57
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=9beda4b9811323d1fd9eb120d6e7a2ef69beed14;hp=842d7dffcb0fc66e67066239b26aae7edae68c8c;p=notmuch

mime-node: handle decrypt_result more safely

If (for whatever reason) we don't get a decrypt_result back, or it's
not structured the way we expect it to be, we shouldn't choke on it.
---

diff --git a/mime-node.c b/mime-node.c
index e1aca969..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)