From c817e7b9798d11f36df1b2d7ee24c5523275d2b9 Mon Sep 17 00:00:00 2001 From: Thomas Roessler Date: Thu, 29 May 2003 17:47:10 +0000 Subject: [PATCH] Fix a segmentation fault which would occur when pgp_sort_keys is set in a configuration file, but mutt is compiled without PGP support. --- init.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/init.c b/init.c index 557eb098..ab283524 100644 --- a/init.c +++ b/init.c @@ -1173,7 +1173,7 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err) } else if (DTYPE (MuttVars[idx].type) == DT_SORT) { - const struct mapping_t *map; + const struct mapping_t *map = NULL; switch (MuttVars[idx].type & DT_SUBTYPE_MASK) { @@ -1195,6 +1195,13 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err) break; } + if (!map) + { + snprintf (err->data, err->dsize, _("%s: Unknown type."), MuttVars[idx].option); + r = -1; + break; + } + if (query || *s->dptr != '=') { p = mutt_getnamebyvalue (*((short *) MuttVars[idx].data) & SORT_MASK, map); -- 2.50.1