From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Wed, 20 Oct 2010 19:20:33 +0000 (+0300)
Subject: If pk is NULL, the backend would segfault when accessing ->algo and the
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=4a75c7f9f1120db240b4ddccaa7d46f82bb495c0;p=users%2Fc2main%2Fpostgres.git

If pk is NULL, the backend would segfault when accessing ->algo and the
following NULL check was never reached.

This problem was found by Coccinelle (null_ref.cocci from coccicheck).

Marti Raudsepp
---

diff --git a/contrib/pgcrypto/pgp-pubenc.c b/contrib/pgcrypto/pgp-pubenc.c
index 0e9ebb4285..9b44fbfc69 100644
--- a/contrib/pgcrypto/pgp-pubenc.c
+++ b/contrib/pgcrypto/pgp-pubenc.c
@@ -199,7 +199,7 @@ pgp_write_pubenc_sesskey(PGP_Context *ctx, PushFilter *dst)
 	PGP_PubKey *pk = ctx->pub_key;
 	uint8		ver = 3;
 	PushFilter *pkt = NULL;
-	uint8		algo = pk->algo;
+	uint8		algo;
 
 	if (pk == NULL)
 	{
@@ -207,6 +207,8 @@ pgp_write_pubenc_sesskey(PGP_Context *ctx, PushFilter *dst)
 		return PXE_BUG;
 	}
 
+	algo = pk->algo;
+
 	/*
 	 * now write packet
 	 */