[PATCH] crypto: return NULL cryptoctx if protocol string is empty.

[PATCH] crypto: return NULL cryptoctx if protocol string is empty.

[Jameson Graef Rollins]

Badly formed messages that don't specify a protocol in
signed/encrypted parts, end up with a protocol of NULL.  strcasecmp in
notmuch_crypto_get_context then segfaults when trying to check it
against known protocols.  If the protocol is NULL, just return an
empty context immediately (with appropriate message.)
---
 crypto.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crypto.c b/crypto.c
index 9736517..6f4a6db 100644
--- a/crypto.c
+++ b/crypto.c
@@ -69,6 +69,11 @@ notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol)
 {
     notmuch_crypto_context_t *cryptoctx = NULL;
 
+    if (! protocol) {
+	fprintf (stderr, "Cryptographic protocol is empty.\n");
+	return cryptoctx;
+    }
+
     /* As per RFC 1847 section 2.1: "the [protocol] value token is
      * comprised of the type and sub-type tokens of the Content-Type".
      * As per RFC 1521 section 2: "Content-Type values, subtypes, and
-- 
1.7.10.4

Re: [PATCH] crypto: return NULL cryptoctx if protocol string is empty.

[Jameson Graef Rollins]

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

On Fri, Jul 19 2013, Jameson Graef Rollins <jrollins@finestructure.net> wrote:
> Badly formed messages that don't specify a protocol in
> signed/encrypted parts, end up with a protocol of NULL.  strcasecmp in
> notmuch_crypto_get_context then segfaults when trying to check it
> against known protocols.  If the protocol is NULL, just return an
> empty context immediately (with appropriate message.)

Fixes bug reported in id:87mwpiu4vi.fsf@zancas.localnet

jamie.

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: [PATCH] crypto: return NULL cryptoctx if protocol string is empty.

[David Bremner]

Jameson Graef Rollins <jrollins@finestructure.net> writes:

> Badly formed messages that don't specify a protocol in
> signed/encrypted parts, end up with a protocol of NULL.  strcasecmp in
> notmuch_crypto_get_context then segfaults when trying to check it
> against known protocols.  If the protocol is NULL, just return an
> empty context immediately (with appropriate message.)

Pushed, thanks for the fix

d