diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-11-30 03:59:26 -0500 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-12-04 21:39:13 -0400 |
| commit | 9beda4b9811323d1fd9eb120d6e7a2ef69beed14 (patch) | |
| tree | 4751cb95bb0046d03d927dd715026674546bbaad /mime-node.c | |
| parent | 842d7dffcb0fc66e67066239b26aae7edae68c8c (diff) | |
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.
Diffstat (limited to 'mime-node.c')
| -rw-r--r-- | mime-node.c | 14 |
1 files changed, 8 insertions, 6 deletions
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) |