From b6d67a84a3a7612997eb90f847c1f3f8638a7258 Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Mon, 10 Apr 2017 14:07:03 +0100
Subject: [PATCH] coverity: add variable - route through code leads to invalid
 variable

---
 alias.c      | 2 +-
 pgppubring.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/alias.c b/alias.c
index e8a549d8a..41db5dc56 100644
--- a/alias.c
+++ b/alias.c
@@ -285,7 +285,7 @@ retry_name:
 
   mutt_addrlist_to_local (adr);
 
-  if (adr)
+  if (adr && adr->mailbox)
     strfcpy (buf, adr->mailbox, sizeof (buf));
   else
     buf[0] = 0;
diff --git a/pgppubring.c b/pgppubring.c
index d844631df..5d152db25 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -691,7 +691,7 @@ static pgp_key_t pgp_parse_keyblock (FILE * fp)
 	if (pt == PT_SUBKEY || pt == PT_SUBSECKEY)
 	{
 	  p->flags |= KEYFLAG_SUBKEY;
-	  if (p != root)
+	  if (root && (p != root))
 	  {
 	    p->parent  = root;
 	    p->address = pgp_copy_uids (root->address, p);
-- 
2.40.0