[PATCH 09/20] util/crypto: add information about the payload part

[David Bremner]

Daniel Kahn Gillmor <dkg at fifthhorseman.net> writes:

> @@ -270,7 +274,7 @@ _notmuch_message_crypto_potential_payload (_notmuch_message_crypto_t *msg_crypto
>      if (parent && GMIME_IS_MULTIPART_ENCRYPTED (parent) && childnum == GMIME_MULTIPART_ENCRYPTED_VERSION) {
>  	const char *enc_type = g_mime_object_get_content_type_parameter (parent, "protocol");
>  	GMimeContentType *ct = g_mime_object_get_content_type (payload);
> -	if (ct) {
> +	if (ct && enc_type) {
>  	    const char *part_type = g_mime_content_type_get_mime_type (ct);
>  	    if (part_type && strcmp (part_type, enc_type) == 0)
>  		return NOTMUCH_STATUS_SUCCESS;

I couldn't really understand why enc_type was defined earlier than it
was used here. Is this a bug fix?

d